|
@@ -360,9 +360,8 @@ static int cdrom_mrw_exit(struct cdrom_device_info *cdi);
|
|
|
|
|
|
static int cdrom_get_disc_info(struct cdrom_device_info *cdi, disc_information *di);
|
|
|
|
|
|
-#ifdef CONFIG_SYSCTL
|
|
|
static void cdrom_sysctl_register(void);
|
|
|
-#endif /* CONFIG_SYSCTL */
|
|
|
+
|
|
|
static struct cdrom_device_info *topCdromPtr;
|
|
|
|
|
|
static int cdrom_dummy_generic_packet(struct cdrom_device_info *cdi,
|
|
@@ -398,9 +397,7 @@ int register_cdrom(struct cdrom_device_info *cdi)
|
|
|
if (!banner_printed) {
|
|
|
printk(KERN_INFO "Uniform CD-ROM driver " REVISION "\n");
|
|
|
banner_printed = 1;
|
|
|
-#ifdef CONFIG_SYSCTL
|
|
|
cdrom_sysctl_register();
|
|
|
-#endif /* CONFIG_SYSCTL */
|
|
|
}
|
|
|
|
|
|
ENSURE(drive_status, CDC_DRIVE_STATUS );
|
|
@@ -3571,22 +3568,29 @@ static void cdrom_sysctl_unregister(void)
|
|
|
unregister_sysctl_table(cdrom_sysctl_header);
|
|
|
}
|
|
|
|
|
|
+#else /* CONFIG_SYSCTL */
|
|
|
+
|
|
|
+static void cdrom_sysctl_register(void)
|
|
|
+{
|
|
|
+}
|
|
|
+
|
|
|
+static void cdrom_sysctl_unregister(void)
|
|
|
+{
|
|
|
+}
|
|
|
+
|
|
|
#endif /* CONFIG_SYSCTL */
|
|
|
|
|
|
static int __init cdrom_init(void)
|
|
|
{
|
|
|
-#ifdef CONFIG_SYSCTL
|
|
|
cdrom_sysctl_register();
|
|
|
-#endif
|
|
|
+
|
|
|
return 0;
|
|
|
}
|
|
|
|
|
|
static void __exit cdrom_exit(void)
|
|
|
{
|
|
|
printk(KERN_INFO "Uniform CD-ROM driver unloaded\n");
|
|
|
-#ifdef CONFIG_SYSCTL
|
|
|
cdrom_sysctl_unregister();
|
|
|
-#endif
|
|
|
}
|
|
|
|
|
|
module_init(cdrom_init);
|