Merge master.kernel.org:/pub/scm/linux/kernel/git/bart/ide-2.6

[linux-2.6-omap-h63xx.git] / drivers / input / gameport / ns558.c

diff --git a/drivers/input/gameport/ns558.c b/drivers/input/gameport/ns558.c
index 3e2d28f263e9ad56c7b2cb7f3c4d697b28e849db..7b7a546323cfc1c2d65fea2663d1f3f50399f78e 100644 (file)
--- a/drivers/input/gameport/ns558.c
+++ b/drivers/input/gameport/ns558.c
@@ -33,7 +33,6 @@
 
 #include <linux/module.h>
 #include <linux/ioport.h>
-#include <linux/config.h>
 #include <linux/init.h>
 #include <linux/delay.h>
 #include <linux/gameport.h>
@@ -152,7 +151,6 @@ static int ns558_isa_probe(int io)
                return -ENOMEM;
        }
 
-       memset(ns558, 0, sizeof(struct ns558));
        ns558->io = io;
        ns558->size = 1 << i;
        ns558->gameport = port;