aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/brcm47xx/patches-2.6.34/940-bcm47xx-yenta.patch
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@openwrt.org>2010-07-19 20:25:20 +0000
committerHauke Mehrtens <hauke@openwrt.org>2010-07-19 20:25:20 +0000
commitdf0e3483acf444e0768917bb4d4c3bbcde71e1b8 (patch)
treed5497947876a46c2d56f2f702552f5f0b942ce0f /target/linux/brcm47xx/patches-2.6.34/940-bcm47xx-yenta.patch
parent261048484004ddf236940f71874998e09b30f48b (diff)
downloadmaster-187ad058-df0e3483acf444e0768917bb4d4c3bbcde71e1b8.tar.gz
master-187ad058-df0e3483acf444e0768917bb4d4c3bbcde71e1b8.tar.bz2
master-187ad058-df0e3483acf444e0768917bb4d4c3bbcde71e1b8.zip
brcm47xx: prepare brcm47xx patches for sending to mainline.
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@22296 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.patch4
1 files changed, 2 insertions, 2 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 be266e206f..fc64b5c926 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
@@ -17,7 +17,7 @@
mask = probe_irq_mask(val) & 0xffff;
-@@ -1022,6 +1025,10 @@ static void yenta_get_socket_capabilitie
+@@ -1023,6 +1026,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 @@ static int __devinit yenta_probe(struct
+@@ -1261,6 +1268,15 @@ static int __devinit yenta_probe(struct
dev_printk(KERN_INFO, &dev->dev,
"Socket status: %08x\n", cb_readl(socket, CB_SOCKET_STATE));