commented early_printk patch because of rejects.

[linux-flexiantxendom0-3.2.10.git] / drivers / pcmcia / ti113x.h

diff --git a/drivers/pcmcia/ti113x.h b/drivers/pcmcia/ti113x.h
index 4a00995..ca75162 100644 (file)
--- a/drivers/pcmcia/ti113x.h
+++ b/drivers/pcmcia/ti113x.h
@@ -258,6 +258,7 @@ static int ti_override(struct yenta_socket *socket)
        if (new != reg)
                exca_writeb(socket, I365_INTCTL, new);
 
+#if 0
        /*
         * If ISA interrupts don't work, then fall back to routing card
         * interrupts to the PCI interrupt of the socket.
@@ -282,6 +283,7 @@ static int ti_override(struct yenta_socket *socket)
                        config_writeb(socket, TI113X_DEVICE_CONTROL, devctl);
                }
        }
+#endif
 
        socket->socket.ops->init = ti_init;
        return 0;
@@ -325,13 +327,13 @@ static int ti113x_override(struct yenta_socket *socket)
 static int ti1250_init(struct pcmcia_socket *sock)
 {
        struct yenta_socket *socket = container_of(sock, struct yenta_socket, socket);
-       yenta_init(sock);
        ti113x_init(sock);
-       ti_set_zv(sock);
        ti_irqmux(socket) = config_readl(socket, TI122X_IRQMUX);
+#if 0
        ti_irqmux(socket) = (ti_irqmux(socket) & ~0x0f) | 0x02; /* route INTA */
        if (!(ti_sysctl(socket) & TI122X_SCR_INTRTIE))
                ti_irqmux(socket) |= 0x20; /* route INTB */
+#endif
        
        config_writel(socket, TI122X_IRQMUX, ti_irqmux(socket));