Linux-kernel mailing list archive 1997-48,: 2.1.70: cdrom.c module fix

# 2.1.70: cdrom.c module fix

Gerd Knorr (kraxel@goldbach.isdn.cs.tu-berlin.de)
Wed, 3 Dec 1997 11:58:52 +0100 (MET)

- Messages sorted by: [ date ][ thread ][ subject ][ author ]
- Next message: Olaf Titz: "Re: BUG? -- sick virtual terminals......."
- Previous message: Gabriel Paubert: "Re: IDEDMA problems."

Hi !

shuffles around some code to make cdrom.c compile as module

Gerd

----------------------------------------------------------------------------
--- drivers/cdrom/cdrom.c-2.1.70 Wed Dec 3 10:27:14 1997
+++ drivers/cdrom/cdrom.c Wed Dec 3 11:03:24 1997
@@ -882,22 +882,6 @@
#define CDROM_STR_SIZE 1000
static char cdrom_drive_info[CDROM_STR_SIZE]="info\n";
-#ifdef MODULE
-
-static struct ctl_table_header *cdrom_sysctl_header;
-
-static void cdrom_sysctl_register(void)
-{
- cdrom_sysctl_header = register_sysctl_table(cdrom_root_table, 0);
-}
-
-static void cdrom_sysctl_unregister(void)
-{
- unregister_sysctl_table(cdrom_sysctl_header);
-}
-
-#endif
-
/* Place files in /proc/sys/dev/cdrom */
ctl_table cdrom_table[] = {
{DEV_CDROM_INFO, "info", &cdrom_drive_info,
@@ -967,6 +951,19 @@
#ifdef MODULE
+
+static struct ctl_table_header *cdrom_sysctl_header;
+
+static void cdrom_sysctl_register(void)
+{
+ cdrom_sysctl_header = register_sysctl_table(cdrom_root_table, 0);
+}
+
+static void cdrom_sysctl_unregister(void)
+{
+ unregister_sysctl_table(cdrom_sysctl_header);
+}
+
int init_module(void)
{
cdrom_init();

- Next message: Olaf Titz: "Re: BUG? -- sick virtual terminals......."
- Previous message: Gabriel Paubert: "Re: IDEDMA problems."