diff options
| author | Andy Green <andy.green@linaro.org> | 2011-11-30 11:33:41 +0800 |
|---|---|---|
| committer | Andy Green <andy.green@linaro.org> | 2011-11-30 11:33:41 +0800 |
| commit | 0ccecd278c7b7a02be09469fa33717327bf7d4ed (patch) | |
| tree | 48b11a41e32fa40afb303af0e31b3aeb41763573 | |
| parent | cf9cd6889d6d32ded47c12295ff6594cc5c89c52 (diff) | |
config enable thermal sensortilt-android-3.1-0ccecd278c7b7a02be09469fa33717327bf7d4edtilt-android-3.1
Signed-off-by: Andy Green <andy.green@linaro.org>
| -rw-r--r-- | arch/arm/configs/android_omap4_defconfig | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/arch/arm/configs/android_omap4_defconfig b/arch/arm/configs/android_omap4_defconfig index 21a77ab44f9..e5c4a0c860c 100644 --- a/arch/arm/configs/android_omap4_defconfig +++ b/arch/arm/configs/android_omap4_defconfig @@ -31,6 +31,7 @@ CONFIG_MODULE_SRCVERSION_ALL=y CONFIG_BLK_DEV_BSGLIB=y CONFIG_ARCH_OMAP=y CONFIG_OMAP_MUX_DEBUG=y +CONFIG_OMAP_SCM_DEV=y # CONFIG_ARCH_OMAP2 is not set # CONFIG_MACH_OMAP3_BEAGLE is not set # CONFIG_MACH_DEVKIT8000 is not set @@ -146,20 +147,15 @@ CONFIG_SCSI_MULTI_LUN=y CONFIG_SCSI_SCAN_ASYNC=y CONFIG_MD=y CONFIG_NETDEVICES=y -CONFIG_KS8851=y -CONFIG_KS8851_MLL=y -CONFIG_SMC91X=y -CONFIG_SMSC911X=y -CONFIG_SMSC_PHY=y +CONFIG_WL12XX_MENU=m +CONFIG_WL12XX=m +CONFIG_WL12XX_SDIO=m 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 @@ -195,10 +191,12 @@ CONFIG_GPIO_TWL4030=y CONFIG_W1=y CONFIG_POWER_SUPPLY=y # CONFIG_HWMON is not set +CONFIG_THERMAL=y CONFIG_WATCHDOG=y CONFIG_OMAP_WATCHDOG=y CONFIG_TWL4030_WATCHDOG=y CONFIG_MFD_TPS65912_I2C=y +CONFIG_OMAP4460PLUS_SCM=y CONFIG_REGULATOR_DUMMY=y CONFIG_REGULATOR_TWL4030=y CONFIG_REGULATOR_TPS65023=y |