aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/brcm47xx
diff options
context:
space:
mode:
authorGabor Juhos <juhosg@openwrt.org>2010-03-26 10:45:25 +0000
committerGabor Juhos <juhosg@openwrt.org>2010-03-26 10:45:25 +0000
commite66a368bd1c068d50e24bd906cfc6ef7009f7580 (patch)
tree62821cf6f2450be73a617420cf7e4b46f2641232 /target/linux/brcm47xx
parent797967480c2ec11fb788972de03cb35f076f95eb (diff)
downloadupstream-e66a368bd1c068d50e24bd906cfc6ef7009f7580.tar.gz
upstream-e66a368bd1c068d50e24bd906cfc6ef7009f7580.tar.bz2
upstream-e66a368bd1c068d50e24bd906cfc6ef7009f7580.zip
kernel: update to 2.6.32.10
SVN-Revision: 20444
Diffstat (limited to 'target/linux/brcm47xx')
-rw-r--r--target/linux/brcm47xx/Makefile2
-rw-r--r--target/linux/brcm47xx/patches-2.6.32/930-bcm47xx-pci-iomem.patch10
-rw-r--r--target/linux/brcm47xx/patches-2.6.32/940-bcm47xx-yenta.patch14
3 files changed, 11 insertions, 15 deletions
diff --git a/target/linux/brcm47xx/Makefile b/target/linux/brcm47xx/Makefile
index 0d59b363e4..f493929772 100644
--- a/target/linux/brcm47xx/Makefile
+++ b/target/linux/brcm47xx/Makefile
@@ -11,7 +11,7 @@ BOARD:=brcm47xx
BOARDNAME:=Broadcom BCM947xx/953xx
FEATURES:=squashfs usb pcmcia
-LINUX_VERSION:=2.6.32.9
+LINUX_VERSION:=2.6.32.10
include $(INCLUDE_DIR)/target.mk
DEFAULT_PACKAGES += wpad-mini kmod-switch kmod-diag nvram
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 1ceccb5c60..4f47a3c52d 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 aaff523390..5228593537 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));