Commit c0ade016 authored by Linus Torvalds's avatar Linus Torvalds

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

into home.osdl.org:/home/torvalds/v2.5/linux
parents 0544dff9 dba5b972
......@@ -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
......
......@@ -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;
}
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment