X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/7ed9009bbdf799be5f9f1446c264b8504f483beb..5bc450051be79bfae37ad1f185c4d2fb315d7fd7:/target/linux/brcm-2.4/patches/009-wrt54g3g_pcmcia.patch diff --git a/target/linux/brcm-2.4/patches/009-wrt54g3g_pcmcia.patch b/target/linux/brcm-2.4/patches/009-wrt54g3g_pcmcia.patch index 52febdf0c..be84d2d60 100644 --- a/target/linux/brcm-2.4/patches/009-wrt54g3g_pcmcia.patch +++ b/target/linux/brcm-2.4/patches/009-wrt54g3g_pcmcia.patch @@ -1,7 +1,8 @@ -diff -urN linux.old/drivers/pcmcia/yenta.c linux.dev/drivers/pcmcia/yenta.c ---- linux.old/drivers/pcmcia/yenta.c 2004-11-17 12:54:21.000000000 +0100 -+++ linux.dev/drivers/pcmcia/yenta.c 2006-04-11 17:47:45.000000000 +0200 -@@ -543,6 +543,9 @@ +Index: linux-2.4.35.4/drivers/pcmcia/yenta.c +=================================================================== +--- linux-2.4.35.4.orig/drivers/pcmcia/yenta.c ++++ linux-2.4.35.4/drivers/pcmcia/yenta.c +@@ -543,6 +543,9 @@ static unsigned int yenta_probe_irq(pci_ * Probe for usable interrupts using the force * register to generate bogus card status events. */ @@ -11,7 +12,7 @@ diff -urN linux.old/drivers/pcmcia/yenta.c linux.dev/drivers/pcmcia/yenta.c cb_writel(socket, CB_SOCKET_EVENT, -1); cb_writel(socket, CB_SOCKET_MASK, CB_CSTSMASK); exca_writeb(socket, I365_CSCINT, 0); -@@ -557,7 +560,8 @@ +@@ -557,7 +560,8 @@ static unsigned int yenta_probe_irq(pci_ } cb_writel(socket, CB_SOCKET_MASK, 0); exca_writeb(socket, I365_CSCINT, 0); @@ -21,7 +22,7 @@ diff -urN linux.old/drivers/pcmcia/yenta.c linux.dev/drivers/pcmcia/yenta.c mask = probe_irq_mask(val) & 0xffff; bridge_ctrl &= ~CB_BRIDGE_INTR; -@@ -578,6 +582,12 @@ +@@ -578,6 +582,12 @@ static void yenta_get_socket_capabilitie socket->cap.cb_dev = socket->dev; socket->cap.bus = NULL; @@ -34,7 +35,7 @@ diff -urN linux.old/drivers/pcmcia/yenta.c linux.dev/drivers/pcmcia/yenta.c printk(KERN_INFO "Yenta ISA IRQ mask 0x%04x, PCI irq %d\n", socket->cap.irq_mask, socket->cb_irq); } -@@ -609,6 +619,15 @@ +@@ -609,6 +619,15 @@ static void yenta_open_bh(void * data) printk(KERN_INFO "Socket status: %08x\n", cb_readl(socket, CB_SOCKET_STATE)); @@ -50,7 +51,7 @@ diff -urN linux.old/drivers/pcmcia/yenta.c linux.dev/drivers/pcmcia/yenta.c /* Register it with the pcmcia layer.. */ cardbus_register(socket); -@@ -731,7 +750,7 @@ +@@ -731,7 +750,7 @@ static void yenta_allocate_res(pci_socke { struct pci_bus *bus; struct resource *root, *res; @@ -59,7 +60,7 @@ diff -urN linux.old/drivers/pcmcia/yenta.c linux.dev/drivers/pcmcia/yenta.c u32 align, size, min, max; unsigned offset; unsigned mask; -@@ -750,6 +769,15 @@ +@@ -750,6 +769,15 @@ static void yenta_allocate_res(pci_socke res->end = 0; root = pci_find_parent_resource(socket->dev, res); @@ -75,7 +76,7 @@ diff -urN linux.old/drivers/pcmcia/yenta.c linux.dev/drivers/pcmcia/yenta.c if (!root) return; -@@ -794,6 +822,7 @@ +@@ -794,6 +822,7 @@ static void yenta_allocate_res(pci_socke res->start = res->end = 0; return; }