Merge git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild

[karo-tx-linux.git] / drivers / pcmcia / tcic.c

diff --git a/drivers/pcmcia/tcic.c b/drivers/pcmcia/tcic.c
index 2d2f415f80a830e4f35f7f3f5fe73907f430b597..749ac3710914e519c122284a4bd0f32670b990ee 100644 (file)
--- a/drivers/pcmcia/tcic.c
+++ b/drivers/pcmcia/tcic.c
@@ -90,7 +90,7 @@ static int do_scan = 1;
 /* Bit map of interrupts to choose from */
 static u_int irq_mask = 0xffff;
 static int irq_list[16];
-static int irq_list_count;
+static unsigned int irq_list_count;
 
 /* The card status change interrupt -- 0 means autoselect */
 static int cs_irq;
@@ -512,7 +512,7 @@ static int __init init_tcic(void)
     for (i = 0; i < sockets; i++) {
            socket_table[i].socket.ops = &tcic_operations;
            socket_table[i].socket.resource_ops = &pccard_nonstatic_ops;
-           socket_table[i].socket.dev.dev = &tcic_device.dev;
+           socket_table[i].socket.dev.parent = &tcic_device.dev;
            ret = pcmcia_register_socket(&socket_table[i].socket);
            if (ret && i)
                    pcmcia_unregister_socket(&socket_table[0].socket);