diff options
| author | Santosh Shilimkar <santosh.shilimkar@ti.com> | 2009-11-07 06:59:47 +0530 |
|---|---|---|
| committer | Santosh Shilimkar <santosh.shilimkar@ti.com> | 2009-11-07 06:59:47 +0530 |
| commit | 9e034c986287a3338c393836f27e838b8f87539e (patch) | |
| tree | 2a7cdc1384ad5f3ce230310e275cf17aa35db735 /arch/arm/configs/omap_4430sdp_defconfig | |
| parent | 8aa5e79648ce7b16943456f2578b9b68573aac9c (diff) | |
| parent | 3d8b36e8e6725484d6a5d7fc258afaf37ca2db96 (diff) | |
Merge branch 'tesla-dev-v2.6.31_wakeup' of git://dev.omapzoom.org/pub/scm/tisyslink/kernel-syslink into L24x-20091106
Conflicts:
arch/arm/Kconfig
arch/arm/plat-omap/include/mach/irqs.h
drivers/Makefile
Diffstat (limited to 'arch/arm/configs/omap_4430sdp_defconfig')
| -rw-r--r-- | arch/arm/configs/omap_4430sdp_defconfig | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/arch/arm/configs/omap_4430sdp_defconfig b/arch/arm/configs/omap_4430sdp_defconfig index ecf64e2ac9ca..b951c71724dc 100644 --- a/arch/arm/configs/omap_4430sdp_defconfig +++ b/arch/arm/configs/omap_4430sdp_defconfig @@ -199,13 +199,19 @@ CONFIG_ARCH_OMAP4=y # OMAP Feature Selections # # CONFIG_OMAP_RESET_CLOCKS is not set + CONFIG_OMAP_MUX=y # CONFIG_OMAP_MUX_DEBUG is not set CONFIG_OMAP_MUX_WARNINGS=y # CONFIG_OMAP_L2_EVENT_DEBUG is not set # CONFIG_OMAP4_SUDO_ROMCODE is not set CONFIG_OMAP_MCBSP=y -# CONFIG_OMAP_MBOX_FWK is not set + + + + +CONFIG_OMAP_MBOX_FWK=y + # CONFIG_OMAP_MPU_TIMER is not set CONFIG_OMAP_32K_TIMER=y CONFIG_OMAP_32K_TIMER_HZ=128 |