diff options
Diffstat (limited to 'drivers/cdrom/cm206.c')
-rw-r--r-- | drivers/cdrom/cm206.c | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/drivers/cdrom/cm206.c b/drivers/cdrom/cm206.c index f43a988dd413..9b05ddd23141 100644 --- a/drivers/cdrom/cm206.c +++ b/drivers/cdrom/cm206.c | |||
@@ -187,7 +187,6 @@ History: | |||
187 | #include <linux/interrupt.h> | 187 | #include <linux/interrupt.h> |
188 | #include <linux/timer.h> | 188 | #include <linux/timer.h> |
189 | #include <linux/cdrom.h> | 189 | #include <linux/cdrom.h> |
190 | #include <linux/devfs_fs_kernel.h> | ||
191 | #include <linux/ioport.h> | 190 | #include <linux/ioport.h> |
192 | #include <linux/mm.h> | 191 | #include <linux/mm.h> |
193 | #include <linux/slab.h> | 192 | #include <linux/slab.h> |
@@ -915,7 +914,7 @@ static void seek(int lba) | |||
915 | cd->dsb = wait_dsb(); | 914 | cd->dsb = wait_dsb(); |
916 | } | 915 | } |
917 | 916 | ||
918 | uch bcdbin(unsigned char bcd) | 917 | static uch bcdbin(unsigned char bcd) |
919 | { /* stolen from mcd.c! */ | 918 | { /* stolen from mcd.c! */ |
920 | return (bcd >> 4) * 10 + (bcd & 0xf); | 919 | return (bcd >> 4) * 10 + (bcd & 0xf); |
921 | } | 920 | } |
@@ -1533,7 +1532,7 @@ static void __init parse_options(void) | |||
1533 | } | 1532 | } |
1534 | } | 1533 | } |
1535 | 1534 | ||
1536 | static int __cm206_init(void) | 1535 | static int __init __cm206_init(void) |
1537 | { | 1536 | { |
1538 | parse_options(); | 1537 | parse_options(); |
1539 | #if !defined(AUTO_PROBE_MODULE) | 1538 | #if !defined(AUTO_PROBE_MODULE) |
@@ -1594,8 +1593,3 @@ __setup("cm206=", cm206_setup); | |||
1594 | #endif /* !MODULE */ | 1593 | #endif /* !MODULE */ |
1595 | MODULE_ALIAS_BLOCKDEV_MAJOR(CM206_CDROM_MAJOR); | 1594 | MODULE_ALIAS_BLOCKDEV_MAJOR(CM206_CDROM_MAJOR); |
1596 | 1595 | ||
1597 | /* | ||
1598 | * Local variables: | ||
1599 | * 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" | ||
1600 | * End: | ||
1601 | */ | ||