diff --git a/[refs] b/[refs]
index 1cc2dcf9482a..e8ee079e0bc8 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 844add7abca0d10e9733fc16119e53cb4c1987b4
+refs/heads/master: 4a2a4da43995864786d59f5f0ebf42c0c1e2cdd1
diff --git a/trunk/arch/cris/Kconfig b/trunk/arch/cris/Kconfig
index 4b41248b61ad..6b4d026a00a1 100644
--- a/trunk/arch/cris/Kconfig
+++ b/trunk/arch/cris/Kconfig
@@ -180,8 +180,6 @@ source "drivers/isdn/Kconfig"
 
 source "drivers/telephony/Kconfig"
 
-source "drivers/cdrom/Kconfig"
-
 #
 # input before char - char/joystick depends on it. As does USB.
 #