diff options
| author | David Woodhouse <David.Woodhouse@intel.com> | 2009-01-05 04:50:33 -0500 |
|---|---|---|
| committer | David Woodhouse <David.Woodhouse@intel.com> | 2009-01-05 04:50:33 -0500 |
| commit | 353816f43d1fb340ff2d9a911dd5d0799c09f6a5 (patch) | |
| tree | 517290fd884d286fe2971137ac89f89e3567785a /arch/arm/plat-omap/Kconfig | |
| parent | 160bbab3000dafccbe43688e48208cecf4deb879 (diff) | |
| parent | fe0bdec68b77020281dc814805edfe594ae89e0f (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Conflicts:
arch/arm/mach-pxa/corgi.c
arch/arm/mach-pxa/poodle.c
arch/arm/mach-pxa/spitz.c
Diffstat (limited to 'arch/arm/plat-omap/Kconfig')
| -rw-r--r-- | arch/arm/plat-omap/Kconfig | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/plat-omap/Kconfig b/arch/arm/plat-omap/Kconfig index a94f0c44ebc8..46d3b0b9ce69 100644 --- a/arch/arm/plat-omap/Kconfig +++ b/arch/arm/plat-omap/Kconfig | |||
| @@ -14,9 +14,11 @@ config ARCH_OMAP1 | |||
| 14 | 14 | ||
| 15 | config ARCH_OMAP2 | 15 | config ARCH_OMAP2 |
| 16 | bool "TI OMAP2" | 16 | bool "TI OMAP2" |
| 17 | select CPU_V6 | ||
| 17 | 18 | ||
| 18 | config ARCH_OMAP3 | 19 | config ARCH_OMAP3 |
| 19 | bool "TI OMAP3" | 20 | bool "TI OMAP3" |
| 21 | select CPU_V7 | ||
| 20 | 22 | ||
| 21 | endchoice | 23 | endchoice |
| 22 | 24 | ||