PATCH - gameport_{,un}register_port must be static when inline

From: Neil Brown (neilb@cse.unsw.edu.au)
Date: Wed Oct 03 2001 - 23:19:13 EST


Linus,
 2.4.11-pre2 wont compile with some combinations of sound card drivers
 if CONFIG_INPUT_GAMEPORT is not defined, as every driver than include
 gameport.h causes "gameport_register_port" to be defined as a symbol
 and there is a conflict.

 This patch makes the relevant inline functions "static" to avoid this
 problem.

NeilBrown

--- ./include/linux/gameport.h 2001/10/04 02:45:24 1.1
+++ ./include/linux/gameport.h 2001/10/04 03:51:09 1.2
@@ -74,8 +74,8 @@
 void gameport_register_port(struct gameport *gameport);
 void gameport_unregister_port(struct gameport *gameport);
 #else
-void __inline__ gameport_register_port(struct gameport *gameport) { return; }
-void __inline__ gameport_unregister_port(struct gameport *gameport) { return; }
+static void __inline__ gameport_register_port(struct gameport *gameport) { return; }
+static void __inline__ gameport_unregister_port(struct gameport *gameport) { return; }
 #endif
 
 void gameport_register_device(struct gameport_dev *dev);
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/



This archive was generated by hypermail 2b29 : Sun Oct 07 2001 - 21:00:30 EST