hwmon: (adt7475) Move sysfs files removal to a separate function

[safe/jmp/linux-2.6] / drivers / pcmcia / pxa2xx_palmld.c

diff --git a/drivers/pcmcia/pxa2xx_palmld.c b/drivers/pcmcia/pxa2xx_palmld.c
index 1736c67..6fb6f7f 100644 (file)
--- a/drivers/pcmcia/pxa2xx_palmld.c
+++ b/drivers/pcmcia/pxa2xx_palmld.c
@@ -45,7 +45,7 @@ static int palmld_pcmcia_hw_init(struct soc_pcmcia_socket *skt)
        if (ret)
                goto err4;
 
-       skt->irq = IRQ_GPIO(GPIO_NR_PALMLD_PCMCIA_READY);
+       skt->socket.pci_irq = IRQ_GPIO(GPIO_NR_PALMLD_PCMCIA_READY);
        return 0;
 
 err4:
@@ -98,8 +98,8 @@ static void palmld_pcmcia_socket_suspend(struct soc_pcmcia_socket *skt)
 static struct pcmcia_low_level palmld_pcmcia_ops = {
        .owner                  = THIS_MODULE,
 
-       .first                  = 0,
-       .nr                     = 2,
+       .first                  = 1,
+       .nr                     = 1,
 
        .hw_init                = palmld_pcmcia_hw_init,
        .hw_shutdown            = palmld_pcmcia_hw_shutdown,