From 56572f716fc33a0e156f4de138be381e118e88e6 Mon Sep 17 00:00:00 2001 From: florian 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 --- .../patches-2.6.34/700-ssb-gigabit-ethernet-driver.patch | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'target/linux/brcm47xx/patches-2.6.34/700-ssb-gigabit-ethernet-driver.patch') 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 05fa0c7f9..bf6ffedbb 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; -- cgit v1.2.3