patch-2.4.10 linux/drivers/char/joystick/cs461x.c

• Lines: 48
• Date: Wed Sep 12 15:34:06 2001
• Orig file: v2.4.9/linux/drivers/char/joystick/cs461x.c
• Orig date: Wed Apr 11 19:02:30 2001

diff -u --recursive --new-file v2.4.9/linux/drivers/char/joystick/cs461x.c linux/drivers/char/joystick/cs461x.c
@@ -10,21 +10,24 @@
 
 #include <linux/module.h>
 #include <linux/ioport.h>
+#include <linux/config.h>
 #include <linux/init.h>
 #include <linux/gameport.h>
 #include <linux/slab.h>
 #include <linux/pci.h>
 
 MODULE_AUTHOR("Victor Krapivin <vik@belcaf.minsk.by>");
+MODULE_LICENSE("GPL");
 
 /*
 	These options are experimental
 
-#define COOKED_MODE
 #define CS461X_FULL_MAP
-
 */
 
+#define COOKED_MODE
+
+
 #ifndef PCI_VENDOR_ID_CIRRUS
 #define PCI_VENDOR_ID_CIRRUS            0x1013
 #endif
@@ -281,8 +284,6 @@
 	}
 	memset(port, 0, sizeof(struct gameport));
 
-	port->io = -1;
-	port->size = -1;
 	pdev->driver_data = port;
 	
 	port->open = cs461x_gameport_open;
@@ -297,9 +298,8 @@
 
 	gameport_register_port(port);
 
-	printk(KERN_INFO "gameport%d: CS461x PCI", port->number);
-	if (port->size > 1) printk(" size %d", port->size);
-	printk(" speed %d kHz\n", port->speed);
+	printk(KERN_INFO "gameport%d: CS461x Gameport speed %d kHz\n",
+		port->number, port->speed);
 
 	return 0;
 }