Merge tag 'omap-for-v3.8/board-v2-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/boards

From Tony Lindgren <tony@atomide.com>:

Board updates for omaps mostly to deal with enabling
display support with device tree until the bindings
are ready.

* tag 'omap-for-v3.8/board-v2-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
  ARM: OMAP1: use BUG_ON where possible
  OMAP: board-generic: enable DSS for panda & sdp boards
  OMAP: omap4sdp: move display init from board file to dss-common.c
  OMAP: panda: move display init from board file to dss-common.c
  ARM: OMAP2+: Nokia N9/N900/N950 -- mention product names

Signed-off-by: Arnd Bergmann <arnd@arndb.de>

1 files changed, 2 insertions, 2 deletions

diff --git a/arch/arm/mach-omap2/Kconfig b/arch/arm/mach-omap2/Kconfig
index d669e227e00c..2265e5826883 100644
--- a/arch/arm/mach-omap2/Kconfig
+++ b/arch/arm/mach-omap2/Kconfig
@@ -270,14 +270,14 @@ config MACH_NOKIA_N8X0
         select OMAP_PACKAGE_ZAC
 
 config MACH_NOKIA_RM680
-        bool "Nokia RM-680/696 board"
+        bool "Nokia N950 (RM-680) / N9 (RM-696) phones"
         depends on ARCH_OMAP3
         default y
         select MACH_NOKIA_RM696
         select OMAP_PACKAGE_CBB
 
 config MACH_NOKIA_RX51
-        bool "Nokia RX-51 board"
+        bool "Nokia N900 (RX-51) phone"
         depends on ARCH_OMAP3
         default y
         select OMAP_PACKAGE_CBB