diff --git a/[refs] b/[refs]
index 5e8ae498fc98..515ff3627446 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 65ac9f7a23c934ee8c40dc20955e75db4924bfea
+refs/heads/master: 45b2604eaaa105223ce60117b0482ca8a488f9c4
diff --git a/trunk/include/linux/gameport.h b/trunk/include/linux/gameport.h
index b456b08d70ed..b986be513406 100644
--- a/trunk/include/linux/gameport.h
+++ b/trunk/include/linux/gameport.h
@@ -153,6 +153,19 @@ int __must_check __gameport_register_driver(struct gameport_driver *drv,
 
 void gameport_unregister_driver(struct gameport_driver *drv);
 
+/**
+ * module_gameport_driver() - Helper macro for registering a gameport driver
+ * @__gameport_driver: gameport_driver struct
+ *
+ * Helper macro for gameport drivers which do not do anything special in
+ * module init/exit. This eliminates a lot of boilerplate. Each module may
+ * only use this macro once, and calling it replaces module_init() and
+ * module_exit().
+ */
+#define module_gameport_driver(__gameport_driver) \
+	module_driver(__gameport_driver, gameport_register_driver, \
+		       gameport_unregister_driver)
+
 #endif /* __KERNEL__ */
 
 #define GAMEPORT_MODE_DISABLED		0