diff --git a/[refs] b/[refs]
index 1e236033abed..5fe916a4c048 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 36763b22bee56713057762bb0756e8075b5bb918
+refs/heads/master: f137c319db9d4227f1857f9ff886278ad61c8207
diff --git a/trunk/arch/sh/Kconfig.sh64 b/trunk/arch/sh/Kconfig.sh64
index e37cd8c51e34..9f71f9531c08 100644
--- a/trunk/arch/sh/Kconfig.sh64
+++ b/trunk/arch/sh/Kconfig.sh64
@@ -106,27 +106,11 @@ config SH64_FPU_DENORM_FLUSH
 	depends on SH_FPU
 	bool "Flush floating point denorms to zero"
 
-choice
-	prompt "Page table levels"
-	default SH64_PGTABLE_2_LEVEL
-
-config SH64_PGTABLE_2_LEVEL
-	bool "2"
-
-config SH64_PGTABLE_3_LEVEL
-	bool "3"
-
-endchoice
-
 config SH64_USER_MISALIGNED_FIXUP
 	bool "Fixup misaligned loads/stores occurring in user mode"
 
 comment "Memory options"
 
-config CACHED_MEMORY_OFFSET
-	hex "Cached Area Offset"
-	default "20000000"
-
 config MEMORY_START
 	hex "Physical memory start address"
 	default "80000000"
@@ -159,22 +143,6 @@ endchoice
 config ICACHE_DISABLED
 	bool "ICache Disabling"
 
-config PCIDEVICE_MEMORY_START
-	hex
-	default "C0000000"
-
-config DEVICE_MEMORY_START
-	hex
-	default "E0000000"
-
-config FLASH_MEMORY_START
-	hex "Flash memory/on-chip devices start address"
-	default "00000000"
-
-config PCI_BLOCK_START
-	hex "PCI block start address"
-	default "40000000"
-
 comment "CPU Subtype specific options"
 
 config SH64_ID2815_WORKAROUND