summaryrefslogtreecommitdiff
path: root/arch/arm/configs
diff options
context:
space:
mode:
authorRakesh Goyal <rgoyal@nvidia.com>2012-02-01 16:04:31 +0530
committerRohan Somvanshi <rsomvanshi@nvidia.com>2012-02-03 05:39:16 -0800
commit28a95db482a1b21fc74e3c5e4bae93ad82e581cf (patch)
tree0ce127491cbc154fb2c34ffff737c106be849469 /arch/arm/configs
parentdb4040a616535967a1ff704a1e3e99e956ac5b21 (diff)
arm: tegra: defconfig: enable NFC
enable CONFIG_NFC and CONFIG_PN544_NFC to support pn544. Bug 932798 Change-Id: I411edc7dbf97afd050cfe4f68991a2f132886773 Signed-off-by: Rakesh Goyal <rgoyal@nvidia.com> Reviewed-on: http://git-master/r/78689 Reviewed-by: Rohan Somvanshi <rsomvanshi@nvidia.com> Tested-by: Rohan Somvanshi <rsomvanshi@nvidia.com>
Diffstat (limited to 'arch/arm/configs')
-rw-r--r--arch/arm/configs/tegra3_android_defconfig4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/configs/tegra3_android_defconfig b/arch/arm/configs/tegra3_android_defconfig
index 91728a71a022..5c79a19b829c 100644
--- a/arch/arm/configs/tegra3_android_defconfig
+++ b/arch/arm/configs/tegra3_android_defconfig
@@ -175,6 +175,8 @@ CONFIG_LIB80211=m
CONFIG_MAC80211=m
CONFIG_RFKILL=y
CONFIG_CAIF=y
+CONFIG_NFC=y
+CONFIG_PN544_NFC=y
# CONFIG_FIRMWARE_IN_KERNEL is not set
CONFIG_BLK_DEV_LOOP=y
CONFIG_MISC_DEVICES=y
@@ -364,8 +366,6 @@ CONFIG_MMC_BLOCK_MINORS=16
CONFIG_MMC_SDHCI=y
CONFIG_MMC_SDHCI_PLTFM=y
CONFIG_MMC_SDHCI_TEGRA=y
-CONFIG_NFC_DEVICES=y
-CONFIG_PN544_NFC=y
CONFIG_SWITCH=y
CONFIG_RTC_CLASS=y
CONFIG_RTC_DRV_MAX77663=y