aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-omap2
diff options
context:
space:
mode:
Diffstat (limited to 'arch/arm/mach-omap2')
-rw-r--r--arch/arm/mach-omap2/Kconfig4
-rw-r--r--arch/arm/mach-omap2/board-rm680.c2
-rw-r--r--arch/arm/mach-omap2/board-rx51.c2
3 files changed, 4 insertions, 4 deletions
diff --git a/arch/arm/mach-omap2/Kconfig b/arch/arm/mach-omap2/Kconfig
index 2a1a898c7f90..1f3ff5f52fda 100644
--- a/arch/arm/mach-omap2/Kconfig
+++ b/arch/arm/mach-omap2/Kconfig
@@ -271,14 +271,14 @@ config MACH_NOKIA_N8X0
271 select OMAP_PACKAGE_ZAC 271 select OMAP_PACKAGE_ZAC
272 272
273config MACH_NOKIA_RM680 273config MACH_NOKIA_RM680
274 bool "Nokia RM-680/696 board" 274 bool "Nokia N950 (RM-680) / N9 (RM-696) phones"
275 depends on ARCH_OMAP3 275 depends on ARCH_OMAP3
276 default y 276 default y
277 select MACH_NOKIA_RM696 277 select MACH_NOKIA_RM696
278 select OMAP_PACKAGE_CBB 278 select OMAP_PACKAGE_CBB
279 279
280config MACH_NOKIA_RX51 280config MACH_NOKIA_RX51
281 bool "Nokia RX-51 board" 281 bool "Nokia N900 (RX-51) phone"
282 depends on ARCH_OMAP3 282 depends on ARCH_OMAP3
283 default y 283 default y
284 select OMAP_PACKAGE_CBB 284 select OMAP_PACKAGE_CBB
diff --git a/arch/arm/mach-omap2/board-rm680.c b/arch/arm/mach-omap2/board-rm680.c
index 45997bfbcbd2..42ac9d3f2a59 100644
--- a/arch/arm/mach-omap2/board-rm680.c
+++ b/arch/arm/mach-omap2/board-rm680.c
@@ -1,5 +1,5 @@
1/* 1/*
2 * Board support file for Nokia RM-680/696. 2 * Board support file for Nokia N950 (RM-680) / N9 (RM-696).
3 * 3 *
4 * Copyright (C) 2010 Nokia 4 * Copyright (C) 2010 Nokia
5 * 5 *
diff --git a/arch/arm/mach-omap2/board-rx51.c b/arch/arm/mach-omap2/board-rx51.c
index 7bbb05d9689b..e5af1197a4b5 100644
--- a/arch/arm/mach-omap2/board-rx51.c
+++ b/arch/arm/mach-omap2/board-rx51.c
@@ -1,5 +1,5 @@
1/* 1/*
2 * linux/arch/arm/mach-omap2/board-rx51.c 2 * Board support file for Nokia N900 (aka RX-51).
3 * 3 *
4 * Copyright (C) 2007, 2008 Nokia 4 * Copyright (C) 2007, 2008 Nokia
5 * 5 *