Pull address_range into release branch

[powerpc.git] / drivers / pcmcia / pd6729.c

diff --git a/drivers/pcmcia/pd6729.c b/drivers/pcmcia/pd6729.c
index e7a6d9a..247ab83 100644 (file)
--- a/drivers/pcmcia/pd6729.c
+++ b/drivers/pcmcia/pd6729.c
@@ -8,7 +8,6 @@
  */
 
 #include <linux/kernel.h>
-#include <linux/config.h>
 #include <linux/module.h>
 #include <linux/pci.h>
 #include <linux/init.h>
@@ -590,7 +589,7 @@ static int pd6729_check_irq(int irq, int flags)
        return 0;
 }
 
-static u_int __init pd6729_isa_scan(void)
+static u_int __devinit pd6729_isa_scan(void)
 {
        u_int mask0, mask = 0;
        int i;
@@ -634,13 +633,11 @@ static int __devinit pd6729_pci_probe(struct pci_dev *dev,
        char configbyte;
        struct pd6729_socket *socket;
 
-       socket = kmalloc(sizeof(struct pd6729_socket) * MAX_SOCKETS,
+       socket = kzalloc(sizeof(struct pd6729_socket) * MAX_SOCKETS,
                         GFP_KERNEL);
        if (!socket)
                return -ENOMEM;
 
-       memset(socket, 0, sizeof(struct pd6729_socket) * MAX_SOCKETS);
-
        if ((ret = pci_enable_device(dev)))
                goto err_out_free_mem;