Merge bk://linux-input@bkbits.net/linux-input

into twilight.ucw.cz:/home/vojtech/bk/input

include/linux/gameport.h

@@ -38,7 +38,6 @@ struct gameport {
 	void *driver;	/* Private pointer for gameport drivers */
 	char *name;
 	char *phys;
-	int number;
 
 	unsigned short idbus;
 	unsigned short idvendor;