Manual merge with Linus.

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

diff --git a/include/linux/gameport.h b/include/linux/gameport.h
index 3e1b9b285258440037342adb50aef6884a952318..71e7b2847cb30e3842b8a3ce9eb61bbf6b53e8d6 100644 (file)
--- a/include/linux/gameport.h
+++ b/include/linux/gameport.h
@@ -120,7 +120,7 @@ static inline void gameport_set_name(struct gameport *gameport, const char *name
 }
 
 /*
- * Use the following fucntions to manipulate gameport's per-port
+ * Use the following functions to manipulate gameport's per-port
  * driver-specific data.
  */
 static inline void *gameport_get_drvdata(struct gameport *gameport)
@@ -134,7 +134,7 @@ static inline void gameport_set_drvdata(struct gameport *gameport, void *data)
 }
 
 /*
- * Use the following fucntions to pin gameport's driver in process context
+ * Use the following functions to pin gameport's driver in process context
  */
 static inline int gameport_pin_driver(struct gameport *gameport)
 {