Merge branch 'linux-2.6'

1 files changed, 14 insertions, 4 deletions

diff --git a/arch/sh/boards/renesas/r7780rp/Kconfig b/arch/sh/boards/renesas/r7780rp/Kconfig
index c26d9813d239..9fb11641fe13 100644
--- a/arch/sh/boards/renesas/r7780rp/Kconfig
+++ b/arch/sh/boards/renesas/r7780rp/Kconfig
@@ -1,14 +1,24 @@
-if SH_R7780RP
+if SH_HIGHLANDER
 
-menu "R7780RP options"
+choice
+        prompt "Highlander options"
+        default SH_R7780MP
+
+config SH_R7780RP
+        bool "R7780RP-1 board support"
+        select CPU_SUBTYPE_SH7780
 
 config SH_R7780MP
         bool "R7780MP board support"
-        default y
+        select CPU_SUBTYPE_SH7780
         help
           Selecting this option will enable support for the mass-production
           version of the R7780RP. If in doubt, say Y.
 
-endmenu
+config SH_R7785RP
+        bool "R7785RP board support"
+        select CPU_SUBTYPE_SH7785
+
+endchoice
 
 endif