diff options
| author | Hauke Mehrtens <hauke@openwrt.org> | 2010-04-18 18:22:50 +0000 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@openwrt.org> | 2010-04-18 18:22:50 +0000 |
| commit | 8eed02d63862f191cf202e73d19b0c20e6057f0f (patch) | |
| tree | 9b2a24436bad611f5f67eb2380bff949a5151983 /target/linux/brcm47xx/patches-2.6.34/940-bcm47xx-yenta.patch | |
| parent | 6ba45a161d9da974c3fcd365679187195179f1ee (diff) | |
| download | upstream-8eed02d63862f191cf202e73d19b0c20e6057f0f.tar.gz upstream-8eed02d63862f191cf202e73d19b0c20e6057f0f.tar.bz2 upstream-8eed02d63862f191cf202e73d19b0c20e6057f0f.zip | |
brcm47xx: refresh patches
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@20996 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/brcm47xx/patches-2.6.34/940-bcm47xx-yenta.patch')
| -rw-r--r-- | target/linux/brcm47xx/patches-2.6.34/940-bcm47xx-yenta.patch | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/target/linux/brcm47xx/patches-2.6.34/940-bcm47xx-yenta.patch b/target/linux/brcm47xx/patches-2.6.34/940-bcm47xx-yenta.patch index ee63e30b3b..be266e206f 100644 --- a/target/linux/brcm47xx/patches-2.6.34/940-bcm47xx-yenta.patch +++ b/target/linux/brcm47xx/patches-2.6.34/940-bcm47xx-yenta.patch @@ -1,6 +1,6 @@ ---- a/drivers/pcmcia/yenta_socket.c -+++ b/drivers/pcmcia/yenta_socket.c -@@ -924,6 +924,8 @@ +--- a/drivers/pcmcia/yenta_socket.c ++++ b/drivers/pcmcia/yenta_socket.c +@@ -924,6 +924,8 @@ static unsigned int yenta_probe_irq(stru * Probe for usable interrupts using the force * register to generate bogus card status events. */ @@ -9,7 +9,7 @@ cb_writel(socket, CB_SOCKET_EVENT, -1); cb_writel(socket, CB_SOCKET_MASK, CB_CSTSMASK); reg = exca_readb(socket, I365_CSCINT); -@@ -939,6 +941,7 @@ +@@ -939,6 +941,7 @@ static unsigned int yenta_probe_irq(stru } cb_writel(socket, CB_SOCKET_MASK, 0); exca_writeb(socket, I365_CSCINT, reg); @@ -17,7 +17,7 @@ mask = probe_irq_mask(val) & 0xffff; -@@ -1022,6 +1025,10 @@ +@@ -1022,6 +1025,10 @@ static void yenta_get_socket_capabilitie else socket->socket.irq_mask = 0; @@ -28,7 +28,7 @@ dev_printk(KERN_INFO, &socket->dev->dev, "ISA IRQ mask 0x%04x, PCI irq %d\n", socket->socket.irq_mask, socket->cb_irq); -@@ -1260,6 +1267,15 @@ +@@ -1260,6 +1267,15 @@ static int __devinit yenta_probe(struct dev_printk(KERN_INFO, &dev->dev, "Socket status: %08x\n", cb_readl(socket, CB_SOCKET_STATE)); |