git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge to Fedora kernel-2.6.18-1.2224_FC5 patched with stable patch-2.6.18.1-vs2.0...
[linux-2.6.git]
/
drivers
/
cdrom
/
cm206.c
diff --git
a/drivers/cdrom/cm206.c
b/drivers/cdrom/cm206.c
index
f43a988
..
9b05ddd
100644
(file)
--- a/
drivers/cdrom/cm206.c
+++ b/
drivers/cdrom/cm206.c
@@
-187,7
+187,6
@@
History:
#include <linux/interrupt.h>
#include <linux/timer.h>
#include <linux/cdrom.h>
#include <linux/interrupt.h>
#include <linux/timer.h>
#include <linux/cdrom.h>
-#include <linux/devfs_fs_kernel.h>
#include <linux/ioport.h>
#include <linux/mm.h>
#include <linux/slab.h>
#include <linux/ioport.h>
#include <linux/mm.h>
#include <linux/slab.h>
@@
-915,7
+914,7
@@
static void seek(int lba)
cd->dsb = wait_dsb();
}
cd->dsb = wait_dsb();
}
-uch bcdbin(unsigned char bcd)
+
static
uch bcdbin(unsigned char bcd)
{ /* stolen from mcd.c! */
return (bcd >> 4) * 10 + (bcd & 0xf);
}
{ /* stolen from mcd.c! */
return (bcd >> 4) * 10 + (bcd & 0xf);
}
@@
-1533,7
+1532,7
@@
static void __init parse_options(void)
}
}
}
}
-static int __cm206_init(void)
+static int __
init __
cm206_init(void)
{
parse_options();
#if !defined(AUTO_PROBE_MODULE)
{
parse_options();
#if !defined(AUTO_PROBE_MODULE)
@@
-1594,8
+1593,3
@@
__setup("cm206=", cm206_setup);
#endif /* !MODULE */
MODULE_ALIAS_BLOCKDEV_MAJOR(CM206_CDROM_MAJOR);
#endif /* !MODULE */
MODULE_ALIAS_BLOCKDEV_MAJOR(CM206_CDROM_MAJOR);
-/*
- * Local variables:
- * compile-command: "gcc -D__KERNEL__ -I/usr/src/linux/include -Wall -Wstrict-prototypes -O2 -fomit-frame-pointer -pipe -fno-strength-reduce -m486 -DMODULE -DMODVERSIONS -include /usr/src/linux/include/linux/modversions.h -c -o cm206.o cm206.c"
- * End:
- */