patch-2.2.6 linux/drivers/cdrom/mcd.c

• Lines: 27
• Date: Mon Apr 12 16:18:28 1999
• Orig file: v2.2.5/linux/drivers/cdrom/mcd.c
• Orig date: Sun Nov 8 14:02:52 1998

diff -u --recursive --new-file v2.2.5/linux/drivers/cdrom/mcd.c linux/drivers/cdrom/mcd.c
@@ -67,6 +67,7 @@
 	a CD.
 
 	November 1997 -- ported to the Uniform CD-ROM driver by Erik Andersen.
+	March    1999 -- made io base and irq CONFIG_ options (Tigran Aivazian).
 */
 
 #include <linux/module.h>
@@ -83,6 +84,7 @@
 #include <linux/string.h>
 #include <linux/delay.h>
 #include <linux/init.h>
+#include <linux/config.h>
 
 /* #define REALLY_SLOW_IO  */
 #include <asm/system.h>
@@ -155,8 +157,8 @@
 int mitsumi_bug_93_wait = 0;
 #endif /* WORK_AROUND_MITSUMI_BUG_93 */
 
-static short mcd_port = MCD_BASE_ADDR; /* used as "mcd" by "insmod" */
-static int   mcd_irq  = MCD_INTR_NR; /* must directly follow mcd_port */
+static short mcd_port = CONFIG_MCD_BASE; /* used as "mcd" by "insmod" */
+static int   mcd_irq  = CONFIG_MCD_IRQ; /* must directly follow mcd_port */
 MODULE_PARM(mcd, "1-2i");
 
 static int McdTimeout, McdTries;