summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-omap2/Kconfig
diff options
context:
space:
mode:
authorTony Lindgren <tony@atomide.com>2010-12-18 00:14:02 +0100
committerTony Lindgren <tony@atomide.com>2010-12-18 00:14:02 +0100
commitfea83f6a9b0a90fefca16ac3534e308f6c34144b (patch)
tree3da88c54c83a1cb8ef53db62c9c2c7fc2c2ecbe5 /arch/arm/mach-omap2/Kconfig
parentomap: Fix setting omap_irq_base for 2430 (diff)
parentarm: omap: add minimal support for RM-680 (diff)
downloadlinux-fea83f6a9b0a90fefca16ac3534e308f6c34144b.tar.xz
linux-fea83f6a9b0a90fefca16ac3534e308f6c34144b.zip
Merge branch 'devel-board' into omap-for-linus
Diffstat (limited to 'arch/arm/mach-omap2/Kconfig')
-rw-r--r--arch/arm/mach-omap2/Kconfig6
1 files changed, 6 insertions, 0 deletions
diff --git a/arch/arm/mach-omap2/Kconfig b/arch/arm/mach-omap2/Kconfig
index 144e7bb7c88c..925ccb33d3d4 100644
--- a/arch/arm/mach-omap2/Kconfig
+++ b/arch/arm/mach-omap2/Kconfig
@@ -220,6 +220,12 @@ config MACH_NOKIA_N8X0
select MACH_NOKIA_N810
select MACH_NOKIA_N810_WIMAX
+config MACH_NOKIA_RM680
+ bool "Nokia RM-680 board"
+ depends on ARCH_OMAP3
+ default y
+ select OMAP_PACKAGE_CBB
+
config MACH_NOKIA_RX51
bool "Nokia RX-51 board"
depends on ARCH_OMAP3