summaryrefslogtreecommitdiffstats
path: root/arch/m68k/config.in
diff options
context:
space:
mode:
authorRalf Baechle <ralf@linux-mips.org>1997-12-16 05:34:03 +0000
committerRalf Baechle <ralf@linux-mips.org>1997-12-16 05:34:03 +0000
commit967c65a99059fd459b956c1588ce0ba227912c4e (patch)
tree8224d013ff5d255420713d05610c7efebd204d2a /arch/m68k/config.in
parente20c1cc1656a66a2773bca4591a895cbc12696ff (diff)
Merge with Linux 2.1.72, part 1.
Diffstat (limited to 'arch/m68k/config.in')
-rw-r--r--arch/m68k/config.in11
1 files changed, 11 insertions, 0 deletions
diff --git a/arch/m68k/config.in b/arch/m68k/config.in
index 569da18ce..ab460947b 100644
--- a/arch/m68k/config.in
+++ b/arch/m68k/config.in
@@ -207,6 +207,17 @@ endmenu
fi
+# Conditionally compile in the Uniform CD-ROM driver
+if [ "$CONFIG_BLK_DEV_IDECD" = "y" -o "$CONFIG_BLK_DEV_SR" = "y" ]; then
+ define_bool CONFIG_CDROM y
+else
+ if [ "$CONFIG_BLK_DEV_IDECD" = "m" -o "$CONFIG_BLK_DEV_SR" = "m" ]; then
+ define_bool CONFIG_CDROM m
+ else
+ define_bool CONFIG_CDROM n
+ fi
+fi
+
source fs/Config.in
source fs/nls/Config.in