diff options
| author | Hauke Mehrtens <hauke@hauke-m.de> | 2010-07-19 20:25:20 +0000 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@hauke-m.de> | 2010-07-19 20:25:20 +0000 |
| commit | 49edb3c342b79913df0fa0b16719e2afcab7cfdc (patch) | |
| tree | db3c0bd78af0dd17e5233982fdb1edadfd25bb28 /target/linux/brcm47xx/patches-2.6.34/940-bcm47xx-yenta.patch | |
| parent | 0799e77a8b44009bb6fc34a314bcbf8c970ad47a (diff) | |
| download | upstream-49edb3c342b79913df0fa0b16719e2afcab7cfdc.tar.gz upstream-49edb3c342b79913df0fa0b16719e2afcab7cfdc.tar.bz2 upstream-49edb3c342b79913df0fa0b16719e2afcab7cfdc.zip | |
brcm47xx: prepare brcm47xx patches for sending to mainline.
SVN-Revision: 22296
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 | 4 |
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)); |