diff options
| author | Paul Mackerras <paulus@samba.org> | 2007-05-10 07:08:37 -0400 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2007-05-10 07:08:37 -0400 |
| commit | 2ecf042ef530dd0943e41d84b6344f507941af3e (patch) | |
| tree | 73100361dd74e3f80f14c7c81ba4675948983f44 /arch/arm/mach-omap2/Kconfig | |
| parent | 32a56ebb24f23da1bbaf24292acf85b6c04526ab (diff) | |
| parent | de5603748af8bf7deac403e6ba92887f8d18e812 (diff) | |
Merge branch 'linux-2.6'
Diffstat (limited to 'arch/arm/mach-omap2/Kconfig')
| -rw-r--r-- | arch/arm/mach-omap2/Kconfig | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/mach-omap2/Kconfig b/arch/arm/mach-omap2/Kconfig index aab97ccf1e63..7393109f5c30 100644 --- a/arch/arm/mach-omap2/Kconfig +++ b/arch/arm/mach-omap2/Kconfig | |||
| @@ -9,6 +9,7 @@ config ARCH_OMAP2420 | |||
| 9 | bool "OMAP2420 support" | 9 | bool "OMAP2420 support" |
| 10 | depends on ARCH_OMAP24XX | 10 | depends on ARCH_OMAP24XX |
| 11 | select OMAP_DM_TIMER | 11 | select OMAP_DM_TIMER |
| 12 | select ARCH_OMAP_OTG | ||
| 12 | 13 | ||
| 13 | comment "OMAP Board Type" | 14 | comment "OMAP Board Type" |
| 14 | depends on ARCH_OMAP2 | 15 | depends on ARCH_OMAP2 |
| @@ -20,6 +21,7 @@ config MACH_OMAP_GENERIC | |||
| 20 | config MACH_OMAP_H4 | 21 | config MACH_OMAP_H4 |
| 21 | bool "OMAP 2420 H4 board" | 22 | bool "OMAP 2420 H4 board" |
| 22 | depends on ARCH_OMAP2 && ARCH_OMAP24XX | 23 | depends on ARCH_OMAP2 && ARCH_OMAP24XX |
| 24 | select OMAP_DEBUG_LEDS if LEDS || LEDS_OMAP_DEBUG | ||
| 23 | 25 | ||
| 24 | config MACH_OMAP_APOLLON | 26 | config MACH_OMAP_APOLLON |
| 25 | bool "OMAP 2420 Apollon board" | 27 | bool "OMAP 2420 Apollon board" |