diff --git a/[refs] b/[refs]
index 6b8afde67696..228d22ca5c5e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: bae8ec66554b27967f057a4b7888b09481ff1b8b
+refs/heads/master: 103d6d9170e3ecd9cefee9406bf928e1fcc45cc5
diff --git a/trunk/drivers/char/Kconfig b/trunk/drivers/char/Kconfig
index 1697043119bd..35914b6e1d2a 100644
--- a/trunk/drivers/char/Kconfig
+++ b/trunk/drivers/char/Kconfig
@@ -841,7 +841,7 @@ config JS_RTC
 
 config GEN_RTC
 	tristate "Generic /dev/rtc emulation"
-	depends on RTC!=y && !IA64 && !ARM && !M32R && !MIPS && !SPARC && !FRV && !S390 && !SUPERH && !AVR32
+	depends on RTC!=y && !IA64 && !ARM && !M32R && !MIPS && !SPARC && !FRV && !S390 && !SUPERH && !AVR32 && !BLACKFIN
 	---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