patch-2.1.70 linux/drivers/cdrom/optcd.c

Next file: linux/drivers/cdrom/optcd.h
Previous file: linux/drivers/cdrom/mcdx.h
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.1.69/linux/drivers/cdrom/optcd.c linux/drivers/cdrom/optcd.c
@@ -72,7 +72,7 @@
 #include <linux/blk.h>
 
 #include <linux/cdrom.h>
-#include <linux/optcd.h>
+#include "optcd.h"
 
 #include <asm/uaccess.h>
 
@@ -1838,7 +1838,7 @@
 	case CDROMMULTISESSION:	retval = cdrommultisession(arg); break;
 #endif
 
-	case CDROM_GET_UPC:	retval = -EINVAL; break; /* not implemented */
+	case CDROM_GET_MCN:	retval = -EINVAL; break; /* not implemented */
 	case CDROMVOLREAD:	retval = -EINVAL; break; /* not implemented */
 
 	case CDROMREADRAW:

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen, slshen@lbl.gov