The XT driver (drivers/block/xd.c) failed to compile as a module in
2.1.94. This patch makes it compile cleanly, although it's untested, and
probably blatantly wrong. ;-)
-- -------------------. emarshal at logic.net .--------------------------------- Edward S. Marshall `-----------------------' http://www.logic.net/~emarshal/Spammers: Please email my blacklisting service at "spam@logic.net".
--- drivers/block/xd.c.old Thu Apr 9 21:03:02 1998 +++ drivers/block/xd.c Thu Apr 9 21:04:17 1998 @@ -701,6 +701,12 @@ xd_info[drive].sectors = (u_char)(xd_geo[3 * drive + 2]); } +#ifdef MODULE +static int xd[5] = { -1,-1,-1,-1, }; +MODULE_PARM(xd, "1-4i"); +MODULE_PARM(xd_geo, "3-6i"); +MODULE_PARM(nodma, "i"); + __initfunc(static void xd_dtc_init_controller (unsigned int address)) { switch (address) { @@ -717,6 +723,7 @@ outb(0,XD_RESET); /* reset the controller */ } +#endif __initfunc(static void xd_dtc5150cx_init_drive (u_char drive)) @@ -1118,11 +1125,6 @@ #ifdef MODULE -static int xd[5] = { -1,-1,-1,-1, }; - -MODULE_PARM(xd, "1-4i"); -MODULE_PARM(xd_geo, "3-6i"); -MODULE_PARM(nodma, "i"); static void xd_done (void) {
- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.rutgers.edu