diff options
| author | juhosg <juhosg@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2012-11-18 08:41:31 +0000 |
|---|---|---|
| committer | juhosg <juhosg@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2012-11-18 08:41:31 +0000 |
| commit | b270e13375d156bec7241ac609db0cc9f7bd7cad (patch) | |
| tree | 5944d950befc6e8fa54f52f81ab79305cc4b79f6 /target/linux/brcm63xx | |
| parent | 777a1e41d482587d2d2a8ef622ff277df8423149 (diff) | |
kernel: update linux 3.6 to 3.6.7
Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@34227 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/brcm63xx')
4 files changed, 6 insertions, 6 deletions
diff --git a/target/linux/brcm63xx/Makefile b/target/linux/brcm63xx/Makefile index fe1a9becb8..145532459c 100644 --- a/target/linux/brcm63xx/Makefile +++ b/target/linux/brcm63xx/Makefile @@ -10,7 +10,7 @@ ARCH:=mips BOARD:=brcm63xx BOARDNAME:=Broadcom BCM63xx FEATURES:=squashfs jffs2 usb atm pci pcmcia -LINUX_VERSION:=3.6.6 +LINUX_VERSION:=3.6.7 MAINTAINER:=Florian Fainelli <florian@openwrt.org> include $(INCLUDE_DIR)/target.mk diff --git a/target/linux/brcm63xx/patches-3.6/404-bcm963xx_flashmap.patch b/target/linux/brcm63xx/patches-3.6/404-bcm963xx_flashmap.patch index 30177932c2..1aadfff476 100644 --- a/target/linux/brcm63xx/patches-3.6/404-bcm963xx_flashmap.patch +++ b/target/linux/brcm63xx/patches-3.6/404-bcm963xx_flashmap.patch @@ -23,7 +23,7 @@ Signed-off-by: Axel Gembe <ago@bastart.eu.org> .width = 2, --- a/drivers/mtd/redboot.c +++ b/drivers/mtd/redboot.c -@@ -75,6 +75,7 @@ static int parse_redboot_partitions(stru +@@ -72,6 +72,7 @@ static int parse_redboot_partitions(stru int nulllen = 0; int numslots; unsigned long offset; @@ -31,7 +31,7 @@ Signed-off-by: Axel Gembe <ago@bastart.eu.org> #ifdef CONFIG_MTD_REDBOOT_PARTS_UNALLOCATED static char nullstring[] = "unallocated"; #endif -@@ -179,6 +180,16 @@ static int parse_redboot_partitions(stru +@@ -176,6 +177,16 @@ static int parse_redboot_partitions(stru goto out; } @@ -48,7 +48,7 @@ Signed-off-by: Axel Gembe <ago@bastart.eu.org> for (i = 0; i < numslots; i++) { struct fis_list *new_fl, **prev; -@@ -199,10 +210,10 @@ static int parse_redboot_partitions(stru +@@ -196,10 +207,10 @@ static int parse_redboot_partitions(stru goto out; } new_fl->img = &buf[i]; diff --git a/target/linux/brcm63xx/patches-3.6/438-MIPS-BCM63XX-enable-USB-for-BCM6328.patch b/target/linux/brcm63xx/patches-3.6/438-MIPS-BCM63XX-enable-USB-for-BCM6328.patch index 54673dcf31..1693548d41 100644 --- a/target/linux/brcm63xx/patches-3.6/438-MIPS-BCM63XX-enable-USB-for-BCM6328.patch +++ b/target/linux/brcm63xx/patches-3.6/438-MIPS-BCM63XX-enable-USB-for-BCM6328.patch @@ -49,7 +49,7 @@ Signed-off-by: Jonas Gorski <jonas.gorski@gmail.com> reg &= ~USBH_PRIV_SWAP_EHCI_DATA_MASK; --- a/drivers/usb/host/ohci-bcm63xx.c +++ b/drivers/usb/host/ohci-bcm63xx.c -@@ -94,7 +94,7 @@ static int __devinit ohci_hcd_bcm63xx_dr +@@ -95,7 +95,7 @@ static int __devinit ohci_hcd_bcm63xx_dr bcm_rset_writel(RSET_USBH_PRIV, 0x1c0020, USBH_PRIV_TEST_6358_REG); diff --git a/target/linux/brcm63xx/patches-3.6/441-MIPS-BCM63XX-enable-USB-for-BCM6362.patch b/target/linux/brcm63xx/patches-3.6/441-MIPS-BCM63XX-enable-USB-for-BCM6362.patch index 04d540ffb9..bf1ca1c082 100644 --- a/target/linux/brcm63xx/patches-3.6/441-MIPS-BCM63XX-enable-USB-for-BCM6362.patch +++ b/target/linux/brcm63xx/patches-3.6/441-MIPS-BCM63XX-enable-USB-for-BCM6362.patch @@ -73,7 +73,7 @@ Signed-off-by: Jonas Gorski <jonas.gorski@gmail.com> reg &= ~USBH_PRIV_SWAP_EHCI_DATA_MASK; --- a/drivers/usb/host/ohci-bcm63xx.c +++ b/drivers/usb/host/ohci-bcm63xx.c -@@ -94,7 +94,7 @@ static int __devinit ohci_hcd_bcm63xx_dr +@@ -95,7 +95,7 @@ static int __devinit ohci_hcd_bcm63xx_dr bcm_rset_writel(RSET_USBH_PRIV, 0x1c0020, USBH_PRIV_TEST_6358_REG); |