diff options
| author | Gabor Juhos <juhosg@openwrt.org> | 2012-03-01 19:49:02 +0000 |
|---|---|---|
| committer | Gabor Juhos <juhosg@openwrt.org> | 2012-03-01 19:49:02 +0000 |
| commit | 9698a499b69b8f132bc263e324b9938bb31dde7b (patch) | |
| tree | 0f40f837c5f374a2bbedee1d2b123b6c75865c48 /target/linux/brcm47xx | |
| parent | b12229935da422d82f054c5764bad2ed8aca0aba (diff) | |
| download | upstream-9698a499b69b8f132bc263e324b9938bb31dde7b.tar.gz upstream-9698a499b69b8f132bc263e324b9938bb31dde7b.tar.bz2 upstream-9698a499b69b8f132bc263e324b9938bb31dde7b.zip | |
kernel: update linux 3.2 to 3.2.9
SVN-Revision: 30767
Diffstat (limited to 'target/linux/brcm47xx')
| -rw-r--r-- | target/linux/brcm47xx/Makefile | 2 | ||||
| -rw-r--r-- | target/linux/brcm47xx/patches-3.2/0000-pci-backport.patch | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/target/linux/brcm47xx/Makefile b/target/linux/brcm47xx/Makefile index e39f6ad012..693489375b 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:=3.2.5 +LINUX_VERSION:=3.2.9 include $(INCLUDE_DIR)/target.mk DEFAULT_PACKAGES += wpad-mini kmod-switch kmod-diag nvram diff --git a/target/linux/brcm47xx/patches-3.2/0000-pci-backport.patch b/target/linux/brcm47xx/patches-3.2/0000-pci-backport.patch index 2a31a2089d..b1eed44d6f 100644 --- a/target/linux/brcm47xx/patches-3.2/0000-pci-backport.patch +++ b/target/linux/brcm47xx/patches-3.2/0000-pci-backport.patch @@ -2071,7 +2071,7 @@ /** --- a/drivers/pci/probe.c +++ b/drivers/pci/probe.c -@@ -1522,12 +1522,14 @@ unsigned int __devinit pci_scan_child_bu +@@ -1527,12 +1527,14 @@ unsigned int __devinit pci_scan_child_bu return max; } @@ -2089,7 +2089,7 @@ b = pci_alloc_bus(); if (!b) -@@ -1577,8 +1579,20 @@ struct pci_bus * pci_create_bus(struct d +@@ -1582,8 +1584,20 @@ struct pci_bus * pci_create_bus(struct d pci_create_legacy_files(b); b->number = b->secondary = bus; @@ -2112,7 +2112,7 @@ return b; -@@ -1594,18 +1608,58 @@ err_out: +@@ -1599,18 +1613,58 @@ err_out: return NULL; } |