diff --git a/[refs] b/[refs]
index 248891ff5b97..dab05ee25813 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e934c82657529a85ca48a2fc3749c514df985e79
+refs/heads/master: d7eb079fc8e68899fd099ad0b5b8095193a8c025
diff --git a/trunk/arch/mips/Kconfig b/trunk/arch/mips/Kconfig
index 73455389257a..c20cd9027585 100644
--- a/trunk/arch/mips/Kconfig
+++ b/trunk/arch/mips/Kconfig
@@ -841,15 +841,10 @@ config MIPS_TX3927
 config MIPS_RM9122
 	bool
 	select SERIAL_RM9000
-	select GPI_RM9000
-	select WDT_RM9000
 
 config PCI_MARVELL
 	bool
 
-config SERIAL_RM9000
-	bool
-
 config PNX8550
 	bool
 	select SOC_PNX8550
@@ -875,12 +870,6 @@ config EMMA2RH
 config SERIAL_RM9000
 	bool
 
-config GPI_RM9000
-	bool
-
-config WDT_RM9000
-	bool
-
 #
 # Unfortunately not all GT64120 systems run the chip at the same clock.
 # As the user for the clock rate and try to minimize the available options.