diff options
| author | Andy Green <andy.green@linaro.org> | 2011-11-30 11:16:29 +0800 |
|---|---|---|
| committer | Andy Green <andy.green@linaro.org> | 2011-11-30 11:16:29 +0800 |
| commit | 3a23321e141eae6a6bd3fa9a025eec5398905395 (patch) | |
| tree | 1545265bde72ca975e5d67241c293efc007ae456 | |
| parent | 906641e793f9e58ec580da037ff46888f708a5d5 (diff) | |
config ENCRYPT_FS module
Signed-off-by: Andy Green <andy.green@linaro.org>
| -rw-r--r-- | arch/arm/configs/android_omap4_defconfig | 17 |
1 files changed, 7 insertions, 10 deletions
diff --git a/arch/arm/configs/android_omap4_defconfig b/arch/arm/configs/android_omap4_defconfig index 13333b56b2a..69e41408ec2 100644 --- a/arch/arm/configs/android_omap4_defconfig +++ b/arch/arm/configs/android_omap4_defconfig @@ -33,7 +33,6 @@ CONFIG_ARCH_OMAP=y CONFIG_OMAP_SMARTREFLEX=y CONFIG_OMAP_SMARTREFLEX_CLASS3=y CONFIG_OMAP_MUX_DEBUG=y -CONFIG_OMAP_TEMP_SENSOR=y # CONFIG_ARCH_OMAP2 is not set # CONFIG_MACH_OMAP3_BEAGLE is not set # CONFIG_MACH_DEVKIT8000 is not set @@ -146,23 +145,20 @@ CONFIG_SCSI_MULTI_LUN=y CONFIG_SCSI_SCAN_ASYNC=y CONFIG_MD=y CONFIG_NETDEVICES=y -CONFIG_SMSC_PHY=y -CONFIG_NET_ETHERNET=y -CONFIG_SMC91X=y -CONFIG_SMSC911X=y CONFIG_KS8851=y CONFIG_KS8851_MLL=y -# CONFIG_NETDEV_10000 is not set -CONFIG_WL12XX_MENU=m -CONFIG_WL12XX=m -CONFIG_WL12XX_HT=y -CONFIG_WL12XX_SDIO=m +CONFIG_SMC91X=y +CONFIG_SMSC911X=y +CONFIG_SMSC_PHY=y CONFIG_USB_USBNET=y CONFIG_USB_NET_SMSC95XX=y CONFIG_USB_ALI_M5632=y CONFIG_USB_AN2720=y CONFIG_USB_EPSON2888=y CONFIG_USB_KC2190=y +CONFIG_WL12XX_MENU=m +CONFIG_WL12XX=m +CONFIG_WL12XX_SDIO=m CONFIG_INPUT_JOYDEV=y CONFIG_INPUT_EVDEV=y CONFIG_KEYBOARD_GPIO=y @@ -320,6 +316,7 @@ CONFIG_QFMT_V2=y CONFIG_MSDOS_FS=y CONFIG_VFAT_FS=y CONFIG_TMPFS=y +CONFIG_ECRYPT_FS=y CONFIG_JFFS2_FS=y CONFIG_JFFS2_SUMMARY=y CONFIG_JFFS2_FS_XATTR=y |