diff options
| author | Tony Lindgren <tony@atomide.com> | 2010-12-17 18:14:02 -0500 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2010-12-17 18:14:02 -0500 |
| commit | fea83f6a9b0a90fefca16ac3534e308f6c34144b (patch) | |
| tree | 3da88c54c83a1cb8ef53db62c9c2c7fc2c2ecbe5 /arch/arm/mach-omap2/Kconfig | |
| parent | df127ee375af4cb40b979605e0c336fc79bd38e7 (diff) | |
| parent | 2d200665c37f544f648d77a05a06ab63328f0d3a (diff) | |
Merge branch 'devel-board' into omap-for-linus
Diffstat (limited to 'arch/arm/mach-omap2/Kconfig')
| -rw-r--r-- | arch/arm/mach-omap2/Kconfig | 6 |
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 | |||
| 220 | select MACH_NOKIA_N810 | 220 | select MACH_NOKIA_N810 |
| 221 | select MACH_NOKIA_N810_WIMAX | 221 | select MACH_NOKIA_N810_WIMAX |
| 222 | 222 | ||
| 223 | config MACH_NOKIA_RM680 | ||
| 224 | bool "Nokia RM-680 board" | ||
| 225 | depends on ARCH_OMAP3 | ||
| 226 | default y | ||
| 227 | select OMAP_PACKAGE_CBB | ||
| 228 | |||
| 223 | config MACH_NOKIA_RX51 | 229 | config MACH_NOKIA_RX51 |
| 224 | bool "Nokia RX-51 board" | 230 | bool "Nokia RX-51 board" |
| 225 | depends on ARCH_OMAP3 | 231 | depends on ARCH_OMAP3 |