Merge bk://kernel.bkbits.net/davem/sparc-2.6

into home.osdl.org:/home/torvalds/v2.5/linux

Merge bk://kernel.bkbits.net/davem/sparc-2.6
into home.osdl.org:/home/torvalds/v2.5/linux
c0ade016 · Linus Torvalds · 0544dff9 · dba5b972 · c0ade016 · c0ade016
Commit c0ade016 authored Jan 23, 2004 by Linus Torvalds
Show whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

MAINTAINERS MAINTAINERS +2 -1

drivers/cdrom/cdrom.c drivers/cdrom/cdrom.c +0 -1

No files found.
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -709,7 +709,8 @@ S:	Maintained

 DVB SUBSYSTEM AND DRIVERS
 P:	LinuxTV.org Project
-L: 	linux-dvb@linuxtv.org
+M: 	linux-dvb-maintainer@linuxtv.org
+L: 	linux-dvb@linuxtv.org (subscription required)
 W:	http://linuxtv.org/developer/dvb.xml
 S:	Supported


--- a/drivers/cdrom/cdrom.c
+++ b/drivers/cdrom/cdrom.c
@@ -493,7 +493,6 @@ int cdrom_mrw_probe_pc(struct cdrom_device_info *cdi)
 		return 0;
 	}

-	printk(KERN_ERR "cdrom: %s: unknown mrw mode page\n", cdi->name);
 	return 1;
 }