diff options
| author | Tony Lindgren <tony@atomide.com> | 2010-03-01 17:19:05 -0500 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2010-03-01 17:19:05 -0500 |
| commit | d702d12167a2c05a346f49aac7a311d597762495 (patch) | |
| tree | baae42c299cce34d6df24b5d01f8b1d0b481bd9a /arch/arm/plat-omap/Kconfig | |
| parent | 9418c65f9bd861d0f7e39aab9cfb3aa6f2275d11 (diff) | |
| parent | ac0f6f927db539e03e1f3f61bcd4ed57d5cde7a9 (diff) | |
Merge with mainline to remove plat-omap/Kconfig conflict
Conflicts:
arch/arm/plat-omap/Kconfig
Diffstat (limited to 'arch/arm/plat-omap/Kconfig')
| -rw-r--r-- | arch/arm/plat-omap/Kconfig | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/plat-omap/Kconfig b/arch/arm/plat-omap/Kconfig index be9484a28b12..6da796ef82bd 100644 --- a/arch/arm/plat-omap/Kconfig +++ b/arch/arm/plat-omap/Kconfig | |||
| @@ -31,6 +31,7 @@ config ARCH_OMAP3 | |||
| 31 | depends on ARCH_OMAP2PLUS | 31 | depends on ARCH_OMAP2PLUS |
| 32 | select CPU_V7 | 32 | select CPU_V7 |
| 33 | select USB_ARCH_HAS_EHCI | 33 | select USB_ARCH_HAS_EHCI |
| 34 | select ARM_L1_CACHE_SHIFT_6 | ||
| 34 | 35 | ||
| 35 | config ARCH_OMAP4 | 36 | config ARCH_OMAP4 |
| 36 | bool "TI OMAP4" | 37 | bool "TI OMAP4" |