patch-2.4.0-test2 linux/drivers/char/mem.c

• Lines: 34
• Date: Wed Jun 21 22:31:01 2000
• Orig file: v2.4.0-test1/linux/drivers/char/mem.c
• Orig date: Tue May 23 15:31:34 2000

diff -u --recursive --new-file v2.4.0-test1/linux/drivers/char/mem.c linux/drivers/char/mem.c
@@ -18,7 +18,6 @@
 #include <linux/mman.h>
 #include <linux/random.h>
 #include <linux/init.h>
-#include <linux/joystick.h>
 #include <linux/raw.h>
 #include <linux/capability.h>
 
@@ -606,9 +605,9 @@
     int i;
 
     for (i=0; i<(sizeof(list)/sizeof(*list)); i++)
-	devfs_register (NULL, list[i].name, 0, DEVFS_FL_NONE,
+	devfs_register (NULL, list[i].name, DEVFS_FL_NONE,
 			MEM_MAJOR, list[i].minor,
-			list[i].mode | S_IFCHR, 0, 0,
+			list[i].mode | S_IFCHR,
 			list[i].fops, NULL);
 }
 
@@ -652,13 +651,6 @@
 #ifdef CONFIG_SPARCAUDIO
 	sparcaudio_init();
 #endif
-#ifdef CONFIG_JOYSTICK
-	/*
-	 *	Some joysticks only appear when the sound card they are
-	 *	connected to is configured. Keep the sound/joystick ordering.
-	 */
-	js_init();
-#endif	
 #if CONFIG_QIC02_TAPE
 	qic02_tape_init();
 #endif