[PATCH] Add needed __devexit_p's to two gameport drivers

From: "Noah J. Misch" <noah@caltech.edu>

Two gameport drivers need __devexit_p wrapped around their remove
functions.  A newer binutils caught this is a link error.  This patch fixes
that.

Wrapped a __devexit_p around the 'remove' functions of two gameport
drivers.  The lack of __devexit_p was wrong according to linux/init.h,
differed from the practices in nearby files, and caused a link error with
binutils 2.14.90.0.5.

diff --git a/drivers/input/gameport/fm801-gp.c b/drivers/input/gameport/fm801-gp.c
index 95ca91f911776dc5050db8f8184382f9f7f05557..7cd7deb9c6b0ea616fbedba8fba50aaa8b45fc37 100644 (file)
--- a/drivers/input/gameport/fm801-gp.c
+++ b/drivers/input/gameport/fm801-gp.c
@@ -140,7 +140,7 @@ static struct pci_driver fm801_gp_driver = {
        .name =         "FM801 GP",
        .id_table =     fm801_gp_id_table,
        .probe =        fm801_gp_probe,
-       .remove =       fm801_gp_remove,
+       .remove =       __devexit_p(fm801_gp_remove),
 };
 
 int __init fm801_gp_init(void)

diff --git a/drivers/input/gameport/vortex.c b/drivers/input/gameport/vortex.c
index 32ea09ec5ac33338c1073113bcb79f8c4b19e1b1..55d475d40d87811fd3699853c5475288a2b1e29a 100644 (file)
--- a/drivers/input/gameport/vortex.c
+++ b/drivers/input/gameport/vortex.c
@@ -168,7 +168,7 @@ static struct pci_driver vortex_driver = {
        .name =         "vortex",
        .id_table =     vortex_id_table,
        .probe =        vortex_probe,
-       .remove =       vortex_remove,
+       .remove =       __devexit_p(vortex_remove),
 };
 
 int __init vortex_init(void)