mirror of
git://projects.qi-hardware.com/openwrt-xburst.git
synced 2025-04-21 12:27:27 +03:00
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
This commit is contained in:
@@ -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
|
||||
|
||||
@@ -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];
|
||||
|
||||
@@ -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);
|
||||
|
||||
|
||||
@@ -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);
|
||||
|
||||
|
||||
Reference in New Issue
Block a user