--- linux-2.6.1/drivers/input/gameport/ns558.c.old	2004-01-26 10:03:05.000000000 -0200
+++ linux-2.6.1/drivers/input/gameport/ns558.c	2004-01-26 10:08:18.000000000 -0200
@@ -241,10 +241,6 @@
 	.probe		= ns558_pnp_probe,
 };
 
-#else
-
-static struct pnp_driver ns558_pnp_driver;
-
 #endif
 
 int __init ns558_init(void)
@@ -258,7 +254,10 @@
 	while (ns558_isa_portlist[i])
 		ns558_isa_probe(ns558_isa_portlist[i++]);
 
+#ifdef CONFIG_PNP
 	pnp_register_driver(&ns558_pnp_driver);
+#endif
+
 	return list_empty(&ns558_list) ? -ENODEV : 0;
 }
 
@@ -282,7 +281,9 @@
 				break;
 		}
 	}
+#ifdef CONFIG_PNP
 	pnp_unregister_driver(&ns558_pnp_driver);
+#endif
 }
 
 module_init(ns558_init);