diff options
| author | Ricardo Perez Olivares <x0081762@ti.com> | 2010-07-12 07:59:56 -0500 |
|---|---|---|
| committer | Ricardo Perez Olivares <x0081762@ti.com> | 2010-07-12 07:59:56 -0500 |
| commit | d0847352c50142fb850826e0beb1bb77fded22f9 (patch) | |
| tree | fd35fdf0e3fe73aaedad0d44381c20968c804f25 /arch/arm | |
| parent | c7aeb1b5ce92a63d9146765588528a217b3eb0d8 (diff) | |
| parent | 828ee1d03067a0dfefd7e4bfa4221608083022a4 (diff) | |
Merge branch 'omap4_next' of git://dev.omapzoom.org/pub/scm/santosh/kernel-omap4-base into L24x8
Diffstat (limited to 'arch/arm')
| -rw-r--r-- | arch/arm/configs/omap4_pm_defconfig | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/configs/omap4_pm_defconfig b/arch/arm/configs/omap4_pm_defconfig index 84b11bf65416..e966ee220ed5 100644 --- a/arch/arm/configs/omap4_pm_defconfig +++ b/arch/arm/configs/omap4_pm_defconfig @@ -246,6 +246,7 @@ CONFIG_ARCH_OMAP4=y # CONFIG_OMAP_MUX is not set CONFIG_OMAP_MCBSP=y # CONFIG_OMAP_MBOX_FWK is not set +# CONFIG_OMAP_REMOTE_PROC is not set # CONFIG_OMAP_MPU_TIMER is not set CONFIG_OMAP_32K_TIMER=y CONFIG_OMAP_32K_TIMER_HZ=128 @@ -697,6 +698,7 @@ CONFIG_RTC_LIB=y # TI VLYNQ # # CONFIG_STAGING is not set +# CONFIG_Sys_Link is not set # # File systems |