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

• Lines: 141
• Date: Mon Aug 9 12:14:28 1999
• Orig file: v2.3.12/linux/drivers/char/misc.c
• Orig date: Wed Jun 30 13:38:19 1999

diff -u --recursive --new-file v2.3.12/linux/drivers/char/misc.c linux/drivers/char/misc.c
@@ -28,7 +28,7 @@
  *  corrected by Alan Cox <alan@lxorguk.ukuu.org.uk>
  *
  * Changes for kmod (from kerneld):
- 	Cyrus Durgin <cider@speakeasy.org>
+ *	Cyrus Durgin <cider@speakeasy.org>
  */
 
 #include <linux/module.h>
@@ -43,14 +43,13 @@
 #include <linux/proc_fs.h>
 #include <linux/stat.h>
 #include <linux/init.h>
-#ifdef CONFIG_APM
-#include <linux/apm_bios.h>
-#endif
 
 #include <linux/tty.h>
 #include <linux/selection.h>
 #include <linux/kmod.h>
 
+#include "busmouse.h"
+
 /*
  * Head entry for the doubly linked miscdevice list
  */
@@ -62,14 +61,7 @@
 #define DYNAMIC_MINORS 64 /* like dynamic majors */
 static unsigned char misc_minors[DYNAMIC_MINORS / 8];
 
-extern int bus_mouse_init(void);
-extern int qpmouse_init(void);
-extern int ms_bus_mouse_init(void);
-extern int atixl_busmouse_init(void);
-extern int amiga_mouse_init(void);
-extern int atari_mouse_init(void);
-extern int sun_mouse_init(void);
-extern int adb_mouse_init(void);
+extern int psaux_init(void);
 #ifdef CONFIG_SGI_NEWPORT_GFX
 extern void gfx_register(void);
 #endif
@@ -86,9 +78,12 @@
 extern int dsp56k_init(void);
 extern int nvram_init(void);
 extern int radio_init(void);
-extern void hfmodem_init(void);
 extern int pc110pad_init(void);
 extern int pmu_device_init(void);
+extern int qpmouse_init(void);
+extern int ds1620_init(void);
+extern int nwbutton_init(void);
+extern int nwflash_init(void);
 
 static int misc_read_proc(char *buf, char **start, off_t offset,
 			  int len, int *eof, void *private)
@@ -185,37 +180,19 @@
 EXPORT_SYMBOL(misc_register);
 EXPORT_SYMBOL(misc_deregister);
 
-static struct proc_dir_entry *proc_misc;	
+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;
-#ifdef CONFIG_BUSMOUSE
+#ifdef CONFIG_MOUSE
 	bus_mouse_init();
 #endif
 #if defined CONFIG_82C710_MOUSE
 	qpmouse_init();
 #endif
-#ifdef CONFIG_MS_BUSMOUSE
-	ms_bus_mouse_init();
-#endif
-#ifdef CONFIG_ATIXL_BUSMOUSE
- 	atixl_busmouse_init();
-#endif
-#ifdef CONFIG_AMIGAMOUSE
-	amiga_mouse_init();
-#endif
-#ifdef CONFIG_ATARIMOUSE
-	atari_mouse_init();
-#endif
-#ifdef CONFIG_SUN_MOUSE
-	sun_mouse_init();
-#endif
-#ifdef CONFIG_ADBMOUSE
-	adb_mouse_init();
-#endif
 #ifdef CONFIG_PC110_PAD
 	pc110pad_init();
 #endif
@@ -240,9 +217,6 @@
 #ifdef CONFIG_DTLK
 	dtlk_init();
 #endif
-#ifdef CONFIG_APM
-	apm_bios_init();
-#endif
 #ifdef CONFIG_H8
 	h8_init();
 #endif
@@ -261,18 +235,12 @@
 #ifdef CONFIG_ATARI_DSP56K
 	dsp56k_init();
 #endif
-#ifdef CONFIG_HFMODEM
-	hfmodem_init();
-#endif
 #ifdef CONFIG_NVRAM
 	nvram_init();
 #endif
 #ifdef CONFIG_MISC_RADIO
 	radio_init();
 #endif
-#ifdef CONFIG_HFMODEM
-	hfmodem_init();
-#endif
 #ifdef CONFIG_PMAC_PBOOK
 	pmu_device_init();
 #endif
@@ -281,6 +249,15 @@
 #endif
 #ifdef CONFIG_SGI
 	streamable_init ();
+#endif
+#ifdef CONFIG_DS1620
+	ds1620_init();
+#endif
+#ifdef CONFIG_NWBUTTON
+	nwbutton_init();
+#endif
+#ifdef CONFIG_NWFLASH
+	nwflash_init();
 #endif
 	if (register_chrdev(MISC_MAJOR,"misc",&misc_fops)) {
 		printk("unable to get major %d for misc devices\n",