ARM: Merge for-2637/s3c24xx/rx1950

[karo-tx-linux.git] / include / linux / gameport.h

diff --git a/include/linux/gameport.h b/include/linux/gameport.h
index 361d1cc288d03cc690fbac6638d1e865df289556..b65a6f472775db8cc542f1e515bce9ffec2b1a9c 100644 (file)
--- a/include/linux/gameport.h
+++ b/include/linux/gameport.h
@@ -53,9 +53,7 @@ struct gameport {
 #define to_gameport_port(d)    container_of(d, struct gameport, dev)
 
 struct gameport_driver {
-
-       void *private;
-       char *description;
+       const char *description;
 
        int (*connect)(struct gameport *, struct gameport_driver *drv);
        int (*reconnect)(struct gameport *);