diff --git a/[refs] b/[refs]
index e4fb9f74d2ef..9bca049b6f82 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1d4be747a8077d90e10e1e0b0f8994abb4adacb4
+refs/heads/master: 69d87daa18aced7f494bc1d5a977b063bbbdffbd
diff --git a/trunk/drivers/char/Kconfig b/trunk/drivers/char/Kconfig
index abcafac64738..ef683ebd367c 100644
--- a/trunk/drivers/char/Kconfig
+++ b/trunk/drivers/char/Kconfig
@@ -815,7 +815,7 @@ config SGI_IP27_RTC
 
 config GEN_RTC
 	tristate "Generic /dev/rtc emulation"
-	depends on RTC!=y && !IA64 && !ARM && !M32R && !SPARC && !FRV && !S390
+	depends on RTC!=y && !IA64 && !ARM && !M32R && !SPARC && !FRV && !S390 && !SUPERH
 	---help---
 	  If you say Y here and create a character special file /dev/rtc with
 	  major number 10 and minor number 135 using mknod ("man mknod"), you