aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/brcm47xx/patches-2.6.34/940-bcm47xx-yenta.patch
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@hauke-m.de>2010-04-18 18:22:50 +0000
committerHauke Mehrtens <hauke@hauke-m.de>2010-04-18 18:22:50 +0000
commit79075b8d13dbd022bcf81ba18ede419927cfd6bb (patch)
tree3fea10430e67ca25b154641a72795200c6e34b7b /target/linux/brcm47xx/patches-2.6.34/940-bcm47xx-yenta.patch
parent3ed2f88bbac0d376ad2bc1cab46fba6a2bc395f1 (diff)
downloadupstream-79075b8d13dbd022bcf81ba18ede419927cfd6bb.tar.gz
upstream-79075b8d13dbd022bcf81ba18ede419927cfd6bb.tar.bz2
upstream-79075b8d13dbd022bcf81ba18ede419927cfd6bb.zip
brcm47xx: refresh patches
SVN-Revision: 20996
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.patch12
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));