From 7a32d5d9e311b422a29ac138266a72aeb981c49d Mon Sep 17 00:00:00 2001 From: Florian Fainelli Date: Sun, 22 Aug 2010 17:08:37 +0000 Subject: [kernel] update to 2.6.34.5 git-svn-id: svn://svn.openwrt.org/openwrt/trunk@22768 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- .../015-MIPS-BCM47xx-nvram_getenv-fix-return-value.patch | 4 ++-- .../linux/brcm47xx/patches-2.6.34/211-b44_timeout_spam.patch | 2 +- target/linux/brcm47xx/patches-2.6.34/310-no_highpage.patch | 2 +- target/linux/brcm47xx/patches-2.6.34/400-arch-bcm47xx.patch | 4 ++-- .../patches-2.6.34/700-ssb-gigabit-ethernet-driver.patch | 12 ++++++------ target/linux/brcm47xx/patches-2.6.34/940-bcm47xx-yenta.patch | 2 +- 6 files changed, 13 insertions(+), 13 deletions(-) (limited to 'target/linux/brcm47xx') diff --git a/target/linux/brcm47xx/patches-2.6.34/015-MIPS-BCM47xx-nvram_getenv-fix-return-value.patch b/target/linux/brcm47xx/patches-2.6.34/015-MIPS-BCM47xx-nvram_getenv-fix-return-value.patch index cb2f4e0973..72187a58dd 100644 --- a/target/linux/brcm47xx/patches-2.6.34/015-MIPS-BCM47xx-nvram_getenv-fix-return-value.patch +++ b/target/linux/brcm47xx/patches-2.6.34/015-MIPS-BCM47xx-nvram_getenv-fix-return-value.patch @@ -15,7 +15,7 @@ Signed-off-by: Hauke Mehrtens --- a/arch/mips/bcm47xx/nvram.c +++ b/arch/mips/bcm47xx/nvram.c -@@ -69,7 +69,7 @@ int nvram_getenv(char *name, char *val, +@@ -69,7 +69,7 @@ int nvram_getenv(char *name, char *val, char *var, *value, *end, *eq; if (!name) @@ -24,7 +24,7 @@ Signed-off-by: Hauke Mehrtens if (!nvram_buf[0]) early_nvram_init(); -@@ -89,6 +89,6 @@ int nvram_getenv(char *name, char *val, +@@ -89,6 +89,6 @@ int nvram_getenv(char *name, char *val, return 0; } } diff --git a/target/linux/brcm47xx/patches-2.6.34/211-b44_timeout_spam.patch b/target/linux/brcm47xx/patches-2.6.34/211-b44_timeout_spam.patch index 4dedb82180..f333d71d80 100644 --- a/target/linux/brcm47xx/patches-2.6.34/211-b44_timeout_spam.patch +++ b/target/linux/brcm47xx/patches-2.6.34/211-b44_timeout_spam.patch @@ -1,6 +1,6 @@ --- a/drivers/net/b44.c +++ b/drivers/net/b44.c -@@ -188,10 +188,11 @@ static int b44_wait_bit(struct b44 *bp, +@@ -188,10 +188,11 @@ static int b44_wait_bit(struct b44 *bp, udelay(10); } if (i == timeout) { diff --git a/target/linux/brcm47xx/patches-2.6.34/310-no_highpage.patch b/target/linux/brcm47xx/patches-2.6.34/310-no_highpage.patch index af2289b080..27d5409d26 100644 --- a/target/linux/brcm47xx/patches-2.6.34/310-no_highpage.patch +++ b/target/linux/brcm47xx/patches-2.6.34/310-no_highpage.patch @@ -8,7 +8,7 @@ #include extern void build_clear_page(void); -@@ -78,13 +79,16 @@ static inline void clear_user_page(void +@@ -78,13 +79,16 @@ static inline void clear_user_page(void flush_data_cache_page((unsigned long)addr); } diff --git a/target/linux/brcm47xx/patches-2.6.34/400-arch-bcm47xx.patch b/target/linux/brcm47xx/patches-2.6.34/400-arch-bcm47xx.patch index 439a53a451..aae0556c0e 100644 --- a/target/linux/brcm47xx/patches-2.6.34/400-arch-bcm47xx.patch +++ b/target/linux/brcm47xx/patches-2.6.34/400-arch-bcm47xx.patch @@ -1,7 +1,7 @@ --- a/arch/mips/bcm47xx/nvram.c +++ b/arch/mips/bcm47xx/nvram.c -@@ -92,3 +92,30 @@ int nvram_getenv(char *name, char *val, - return -9; +@@ -92,3 +92,30 @@ int nvram_getenv(char *name, char *val, + return NVRAM_ERR_ENVNOTFOUND; } EXPORT_SYMBOL(nvram_getenv); + diff --git a/target/linux/brcm47xx/patches-2.6.34/700-ssb-gigabit-ethernet-driver.patch b/target/linux/brcm47xx/patches-2.6.34/700-ssb-gigabit-ethernet-driver.patch index 05fa0c7f99..bf6ffedbb3 100644 --- a/target/linux/brcm47xx/patches-2.6.34/700-ssb-gigabit-ethernet-driver.patch +++ b/target/linux/brcm47xx/patches-2.6.34/700-ssb-gigabit-ethernet-driver.patch @@ -8,7 +8,7 @@ #include #include -@@ -471,8 +472,9 @@ static void _tw32_flush(struct tg3 *tp, +@@ -471,8 +472,9 @@ static void _tw32_flush(struct tg3 *tp, static inline void tw32_mailbox_flush(struct tg3 *tp, u32 off, u32 val) { tp->write32_mbox(tp, off, val); @@ -61,7 +61,7 @@ { u32 frame_val; unsigned int loops; -@@ -848,7 +855,7 @@ static int tg3_writephy(struct tg3 *tp, +@@ -848,7 +855,7 @@ static int tg3_writephy(struct tg3 *tp, udelay(80); } @@ -70,7 +70,7 @@ MI_COM_PHY_ADDR_MASK); frame_val |= ((reg << MI_COM_REG_ADDR_SHIFT) & MI_COM_REG_ADDR_MASK); -@@ -881,6 +888,11 @@ static int tg3_writephy(struct tg3 *tp, +@@ -881,6 +888,11 @@ static int tg3_writephy(struct tg3 *tp, return ret; } @@ -147,7 +147,7 @@ tw32(GRC_MODE, tp->grc_mode); if (tp->pci_chip_rev_id == CHIPREV_ID_5705_A0) { -@@ -7135,9 +7173,12 @@ static int tg3_halt_cpu(struct tg3 *tp, +@@ -7135,9 +7173,12 @@ static int tg3_halt_cpu(struct tg3 *tp, return -ENODEV; } @@ -175,7 +175,7 @@ fw_data = (void *)tp->fw->data; /* Firmware blob starts with version numbers, followed by -@@ -7256,6 +7302,11 @@ static int tg3_load_tso_firmware(struct +@@ -7256,6 +7302,11 @@ static int tg3_load_tso_firmware(struct unsigned long cpu_base, cpu_scratch_base, cpu_scratch_size; int err, i; @@ -242,7 +242,7 @@ tw32_f(GRC_EEPROM_ADDR, (EEPROM_ADDR_FSM_RESET | (EEPROM_DEFAULT_CLOCK_PERIOD << -@@ -12020,6 +12087,9 @@ static int tg3_nvram_write_block(struct +@@ -12020,6 +12087,9 @@ static int tg3_nvram_write_block(struct { int ret; diff --git a/target/linux/brcm47xx/patches-2.6.34/940-bcm47xx-yenta.patch b/target/linux/brcm47xx/patches-2.6.34/940-bcm47xx-yenta.patch index fc64b5c926..31c8cfd6fb 100644 --- a/target/linux/brcm47xx/patches-2.6.34/940-bcm47xx-yenta.patch +++ b/target/linux/brcm47xx/patches-2.6.34/940-bcm47xx-yenta.patch @@ -28,7 +28,7 @@ dev_printk(KERN_INFO, &socket->dev->dev, "ISA IRQ mask 0x%04x, PCI irq %d\n", socket->socket.irq_mask, socket->cb_irq); -@@ -1261,6 +1268,15 @@ static int __devinit yenta_probe(struct +@@ -1261,6 +1268,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