diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 1998-09-19 19:15:08 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 1998-09-19 19:15:08 +0000 |
| commit | 03ba4131783cc9e872f8bb26a03f15bc11f27564 (patch) | |
| tree | 88db8dba75ae06ba3bad08e42c5e52efc162535c /drivers/cdrom/cdrom.c | |
| parent | 257730f99381dd26e10b832fce4c94cae7ac1176 (diff) | |
- Merge with Linux 2.1.121.
- Bugfixes.
Diffstat (limited to 'drivers/cdrom/cdrom.c')
| -rw-r--r-- | drivers/cdrom/cdrom.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/cdrom/cdrom.c b/drivers/cdrom/cdrom.c index a2806b858..b31ef1ed6 100644 --- a/drivers/cdrom/cdrom.c +++ b/drivers/cdrom/cdrom.c @@ -76,7 +76,7 @@ of the drive. Thanks to Tobias Ringstr|m <tori@prosolvia.se> for pointing this out and providing a simple fix. -- Fixed the procfs-unload-module bug with the fill_inode procfs callback. - thanks to Andrea Arcangeli <arcangeli@mbox.queen.it> + thanks to Andrea Arcangeli -- Fixed it so that the /proc entry now also shows up when cdrom is compiled into the kernel. Before it only worked when loaded as a module. @@ -184,6 +184,7 @@ struct file_operations cdrom_fops = cdrom_ioctl, /* ioctl */ NULL, /* mmap */ cdrom_open, /* open */ + NULL, /* flush */ cdrom_release, /* release */ NULL, /* fsync */ NULL, /* fasync */ @@ -1081,10 +1082,12 @@ static void cdrom_sysctl_register(void) initialized = 1; } +#ifdef MODULE static void cdrom_sysctl_unregister(void) { unregister_sysctl_table(cdrom_sysctl_header); } +#endif /* endif MODULE */ #endif /* endif CONFIG_SYSCTL */ #ifdef MODULE |