diff options
author | Kumar Gala <galak@kernel.crashing.org> | 2006-04-04 17:10:34 -0400 |
---|---|---|
committer | Kumar Gala <galak@kernel.crashing.org> | 2006-04-04 17:10:34 -0400 |
commit | 12df7556705aae97f24a397377e17898700d7192 (patch) | |
tree | 5adc6b1c2aa940263ee2e88fc6645918533da539 /arch/arm/mach-omap2/Kconfig | |
parent | 34ddf733c415a8e336c996a4303d9f336e0c81b5 (diff) | |
parent | 6246b6128bbe34d0752f119cf7c5111c85fe481d (diff) |
Merge branch 'master'
Diffstat (limited to 'arch/arm/mach-omap2/Kconfig')
-rw-r--r-- | arch/arm/mach-omap2/Kconfig | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/arm/mach-omap2/Kconfig b/arch/arm/mach-omap2/Kconfig index 578880943cf2..537dd2e6d380 100644 --- a/arch/arm/mach-omap2/Kconfig +++ b/arch/arm/mach-omap2/Kconfig | |||
@@ -20,3 +20,6 @@ config MACH_OMAP_H4 | |||
20 | bool "OMAP 2420 H4 board" | 20 | bool "OMAP 2420 H4 board" |
21 | depends on ARCH_OMAP2 && ARCH_OMAP24XX | 21 | depends on ARCH_OMAP2 && ARCH_OMAP24XX |
22 | 22 | ||
23 | config MACH_OMAP_APOLLON | ||
24 | bool "OMAP 2420 Apollon board" | ||
25 | depends on ARCH_OMAP2 && ARCH_OMAP24XX | ||