diff options
| author | Hauke Mehrtens <hauke@openwrt.org> | 2010-07-19 20:25:20 +0000 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@openwrt.org> | 2010-07-19 20:25:20 +0000 |
| commit | df0e3483acf444e0768917bb4d4c3bbcde71e1b8 (patch) | |
| tree | d5497947876a46c2d56f2f702552f5f0b942ce0f /target/linux/brcm47xx/patches-2.6.35/940-bcm47xx-yenta.patch | |
| parent | 261048484004ddf236940f71874998e09b30f48b (diff) | |
| download | upstream-df0e3483acf444e0768917bb4d4c3bbcde71e1b8.tar.gz upstream-df0e3483acf444e0768917bb4d4c3bbcde71e1b8.tar.bz2 upstream-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.35/940-bcm47xx-yenta.patch')
| -rw-r--r-- | target/linux/brcm47xx/patches-2.6.35/940-bcm47xx-yenta.patch | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/target/linux/brcm47xx/patches-2.6.35/940-bcm47xx-yenta.patch b/target/linux/brcm47xx/patches-2.6.35/940-bcm47xx-yenta.patch index be266e206f..b45e62a012 100644 --- a/target/linux/brcm47xx/patches-2.6.35/940-bcm47xx-yenta.patch +++ b/target/linux/brcm47xx/patches-2.6.35/940-bcm47xx-yenta.patch @@ -1,6 +1,6 @@ --- a/drivers/pcmcia/yenta_socket.c +++ b/drivers/pcmcia/yenta_socket.c -@@ -924,6 +924,8 @@ static unsigned int yenta_probe_irq(stru +@@ -922,6 +922,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 @@ static unsigned int yenta_probe_irq(stru +@@ -937,6 +939,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 @@ static void yenta_get_socket_capabilitie +@@ -1021,6 +1024,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 +@@ -1259,6 +1266,15 @@ static int __devinit yenta_probe(struct dev_printk(KERN_INFO, &dev->dev, "Socket status: %08x\n", cb_readl(socket, CB_SOCKET_STATE)); |