From 5ae9fc424c7bcd568dea59f1d62bc542d689d805 Mon Sep 17 00:00:00 2001
From: Adrian Bunk <bunk@kernel.org>
Date: Fri, 10 Aug 2007 13:01:08 -0700
Subject: [PATCH] --- yaml --- r: 63866 b: refs/heads/master c:
 4a2a4da43995864786d59f5f0ebf42c0c1e2cdd1 h: refs/heads/master v: v3

---
 [refs]                  | 2 +-
 trunk/arch/cris/Kconfig | 2 --
 2 files changed, 1 insertion(+), 3 deletions(-)

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.
 #