[ARM] 3695/1: ARM drivers/pcmcia: Fixup includes

[linux-2.6] / drivers / pcmcia / au1000_generic.c

diff --git a/drivers/pcmcia/au1000_generic.c b/drivers/pcmcia/au1000_generic.c
index 0868b72c3996f07738b1febfcda9c0b1e9eae4d4..d5dd0ce65536bcac012f596d7f07586c0303754b 100644 (file)
--- a/drivers/pcmcia/au1000_generic.c
+++ b/drivers/pcmcia/au1000_generic.c
@@ -33,7 +33,6 @@
 #include <linux/module.h>
 #include <linux/moduleparam.h>
 #include <linux/init.h>
-#include <linux/config.h>
 #include <linux/cpufreq.h>
 #include <linux/ioport.h>
 #include <linux/kernel.h>
@@ -354,13 +353,12 @@ int au1x00_pcmcia_socket_probe(struct device *dev, struct pcmcia_low_level *ops,
        struct skt_dev_info *sinfo;
        int ret, i;
 
-       sinfo = kmalloc(sizeof(struct skt_dev_info), GFP_KERNEL);
+       sinfo = kzalloc(sizeof(struct skt_dev_info), GFP_KERNEL);
        if (!sinfo) {
                ret = -ENOMEM;
                goto out;
        }
 
-       memset(sinfo, 0, sizeof(struct skt_dev_info));
        sinfo->nskt = nr;
 
        /*