From b4fcbf11143527779d5e6e99a32d509dd175695d Mon Sep 17 00:00:00 2001 From: juhosg Date: Fri, 26 Mar 2010 10:45:25 +0000 Subject: kernel: update to 2.6.32.10 git-svn-id: svn://svn.openwrt.org/openwrt/trunk@20444 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- .../brcm47xx/patches-2.6.32/930-bcm47xx-pci-iomem.patch | 10 ++++------ .../linux/brcm47xx/patches-2.6.32/940-bcm47xx-yenta.patch | 14 ++++++-------- 2 files changed, 10 insertions(+), 14 deletions(-) (limited to 'target/linux/brcm47xx/patches-2.6.32') diff --git a/target/linux/brcm47xx/patches-2.6.32/930-bcm47xx-pci-iomem.patch b/target/linux/brcm47xx/patches-2.6.32/930-bcm47xx-pci-iomem.patch index 1ceccb5c6..4f47a3c52 100644 --- a/target/linux/brcm47xx/patches-2.6.32/930-bcm47xx-pci-iomem.patch +++ b/target/linux/brcm47xx/patches-2.6.32/930-bcm47xx-pci-iomem.patch @@ -1,8 +1,6 @@ -Index: linux-2.6.33/drivers/ssb/driver_pcicore.c -=================================================================== ---- linux-2.6.33.orig/drivers/ssb/driver_pcicore.c 2010-03-15 14:52:55.000000000 +0100 -+++ linux-2.6.33/drivers/ssb/driver_pcicore.c 2010-03-15 15:57:38.000000000 +0100 -@@ -246,20 +246,12 @@ +--- a/drivers/ssb/driver_pcicore.c ++++ b/drivers/ssb/driver_pcicore.c +@@ -246,20 +246,12 @@ static struct pci_controller ssb_pcicore .pci_ops = &ssb_pcicore_pciops, .io_resource = &ssb_pcicore_io_resource, .mem_resource = &ssb_pcicore_mem_resource, @@ -23,7 +21,7 @@ Index: linux-2.6.33/drivers/ssb/driver_pcicore.c if (d->bus->ops != &ssb_pcicore_pciops) { /* This is not a device on the PCI-core bridge. */ return -ENODEV; -@@ -268,27 +260,6 @@ +@@ -268,27 +260,6 @@ int ssb_pcicore_plat_dev_init(struct pci ssb_printk(KERN_INFO "PCI: Fixing up device %s\n", pci_name(d)); diff --git a/target/linux/brcm47xx/patches-2.6.32/940-bcm47xx-yenta.patch b/target/linux/brcm47xx/patches-2.6.32/940-bcm47xx-yenta.patch index aaff52339..522859353 100644 --- a/target/linux/brcm47xx/patches-2.6.32/940-bcm47xx-yenta.patch +++ b/target/linux/brcm47xx/patches-2.6.32/940-bcm47xx-yenta.patch @@ -1,8 +1,6 @@ -Index: linux-2.6.32.9/drivers/pcmcia/yenta_socket.c -=================================================================== ---- linux-2.6.32.9.orig/drivers/pcmcia/yenta_socket.c 2010-03-12 09:43:45.000000000 +0100 -+++ linux-2.6.32.9/drivers/pcmcia/yenta_socket.c 2010-03-12 10:05:33.000000000 +0100 -@@ -866,6 +866,8 @@ +--- a/drivers/pcmcia/yenta_socket.c ++++ b/drivers/pcmcia/yenta_socket.c +@@ -866,6 +866,8 @@ static unsigned int yenta_probe_irq(stru * Probe for usable interrupts using the force * register to generate bogus card status events. */ @@ -11,7 +9,7 @@ Index: linux-2.6.32.9/drivers/pcmcia/yenta_socket.c cb_writel(socket, CB_SOCKET_EVENT, -1); cb_writel(socket, CB_SOCKET_MASK, CB_CSTSMASK); exca_writeb(socket, I365_CSCINT, 0); -@@ -880,6 +882,7 @@ +@@ -880,6 +882,7 @@ static unsigned int yenta_probe_irq(stru } cb_writel(socket, CB_SOCKET_MASK, 0); exca_writeb(socket, I365_CSCINT, 0); @@ -19,7 +17,7 @@ Index: linux-2.6.32.9/drivers/pcmcia/yenta_socket.c mask = probe_irq_mask(val) & 0xffff; -@@ -960,6 +963,10 @@ +@@ -960,6 +963,10 @@ static void yenta_get_socket_capabilitie else socket->socket.irq_mask = 0; @@ -30,7 +28,7 @@ Index: linux-2.6.32.9/drivers/pcmcia/yenta_socket.c dev_printk(KERN_INFO, &socket->dev->dev, "ISA IRQ mask 0x%04x, PCI irq %d\n", socket->socket.irq_mask, socket->cb_irq); -@@ -1198,6 +1205,15 @@ +@@ -1198,6 +1205,15 @@ static int __devinit yenta_probe (struct dev_printk(KERN_INFO, &dev->dev, "Socket status: %08x\n", cb_readl(socket, CB_SOCKET_STATE)); -- cgit v1.2.3