Commit 5fa458f6 authored by Linus Torvalds's avatar Linus Torvalds

Disable TI cardbus PCI IRQ routing code that was forward-ported

from 2.4-ac - it seems to cause hangs for people.
parent 40212373
...@@ -176,6 +176,9 @@ static int ti_override(struct yenta_socket *socket) ...@@ -176,6 +176,9 @@ static int ti_override(struct yenta_socket *socket)
if (new != reg) if (new != reg)
exca_writeb(socket, I365_INTCTL, new); exca_writeb(socket, I365_INTCTL, new);
#if 0
/* THIS CAUSES HANGS! Disabled for now, do not know why */
/* /*
* If ISA interrupts don't work, then fall back to routing card * If ISA interrupts don't work, then fall back to routing card
* interrupts to the PCI interrupt of the socket. * interrupts to the PCI interrupt of the socket.
...@@ -195,6 +198,7 @@ static int ti_override(struct yenta_socket *socket) ...@@ -195,6 +198,7 @@ static int ti_override(struct yenta_socket *socket)
config_writel(socket, TI122X_IRQMUX, irqmux); config_writel(socket, TI122X_IRQMUX, irqmux);
config_writeb(socket, TI113X_DEVICE_CONTROL, devctl); config_writeb(socket, TI113X_DEVICE_CONTROL, devctl);
} }
#endif
socket->socket.ss_entry->init = ti_init; socket->socket.ss_entry->init = ti_init;
return 0; return 0;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment