patch-2.3.25 linux/drivers/char/misc.c

Next file: linux/drivers/char/nvram.c
Previous file: linux/drivers/char/mem.c
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.3.24/linux/drivers/char/misc.c linux/drivers/char/misc.c
@@ -76,7 +76,6 @@
 extern int rtc_DP8570A_init(void);
 extern int rtc_MK48T08_init(void);
 extern int dsp56k_init(void);
-extern int nvram_init(void);
 extern int radio_init(void);
 extern int pc110pad_init(void);
 extern int pmu_device_init(void);
@@ -180,13 +179,9 @@
 EXPORT_SYMBOL(misc_register);
 EXPORT_SYMBOL(misc_deregister);
 
-static struct proc_dir_entry *proc_misc;
-
 int __init misc_init(void)
 {
-	proc_misc = create_proc_entry("misc", 0, 0);
-	if (proc_misc)
-		proc_misc->read_proc = misc_read_proc;
+	create_proc_read_entry("misc", 0, 0, misc_read_proc, NULL);
 #ifdef CONFIG_BUSMOUSE
 	bus_mouse_init();
 #endif
@@ -234,9 +229,6 @@
 #endif
 #ifdef CONFIG_ATARI_DSP56K
 	dsp56k_init();
-#endif
-#ifdef CONFIG_NVRAM
-	nvram_init();
 #endif
 #ifdef CONFIG_MISC_RADIO
 	radio_init();

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)