diff options
| author | Hauke Mehrtens <hauke@openwrt.org> | 2010-03-08 22:03:00 +0000 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@openwrt.org> | 2010-03-08 22:03:00 +0000 |
| commit | 7bd8de508c3d826e0355a908f1481a1fac816fd7 (patch) | |
| tree | 58299fe7250094ec93ef66f1dc3e05cd8235c14c /target/linux/brcm47xx/patches-2.6.31/700-ssb-gigabit-ethernet-driver.patch | |
| parent | c46b878186ed031d0b21ef71d5d9956039ac91c7 (diff) | |
| download | upstream-7bd8de508c3d826e0355a908f1481a1fac816fd7.tar.gz upstream-7bd8de508c3d826e0355a908f1481a1fac816fd7.tar.bz2 upstream-7bd8de508c3d826e0355a908f1481a1fac816fd7.zip | |
brcm47xx: fix commit r18413 "128MB ram problem"
The patch commited in r18413 was wrong.
This patch prevents prom_init_mem from scanning over 128MB ram.
This is from #6765 and #3177
Refresh all patches
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@20072 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/brcm47xx/patches-2.6.31/700-ssb-gigabit-ethernet-driver.patch')
| -rw-r--r-- | target/linux/brcm47xx/patches-2.6.31/700-ssb-gigabit-ethernet-driver.patch | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/target/linux/brcm47xx/patches-2.6.31/700-ssb-gigabit-ethernet-driver.patch b/target/linux/brcm47xx/patches-2.6.31/700-ssb-gigabit-ethernet-driver.patch index 0273343885..f09eb4f509 100644 --- a/target/linux/brcm47xx/patches-2.6.31/700-ssb-gigabit-ethernet-driver.patch +++ b/target/linux/brcm47xx/patches-2.6.31/700-ssb-gigabit-ethernet-driver.patch @@ -252,7 +252,7 @@ if (tp->tg3_flags & TG3_FLAG_EEPROM_WRITE_PROT) { tw32_f(GRC_LOCAL_CTRL, tp->grc_local_ctrl & ~GRC_LCLCTRL_GPIO_OUTPUT1); -@@ -12136,6 +12205,11 @@ static int __devinit tg3_get_invariants( +@@ -12136,6 +12206,11 @@ static int __devinit tg3_get_invariants( GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5701))) tp->tg3_flags |= TG3_FLAG_SRAM_USE_CONFIG; @@ -264,7 +264,7 @@ /* Get eeprom hw config before calling tg3_set_power_state(). * In particular, the TG3_FLG2_IS_NIC flag must be * determined before calling tg3_set_power_state() so that -@@ -12513,6 +12587,10 @@ static int __devinit tg3_get_device_addr +@@ -12513,6 +12588,10 @@ static int __devinit tg3_get_device_addr } if (!is_valid_ether_addr(&dev->dev_addr[0])) { @@ -275,7 +275,7 @@ #ifdef CONFIG_SPARC if (!tg3_get_default_macaddr_sparc(tp)) return 0; -@@ -13004,6 +13082,7 @@ static char * __devinit tg3_phy_string(s +@@ -13004,6 +13083,7 @@ static char * __devinit tg3_phy_string(s case PHY_ID_BCM5704: return "5704"; case PHY_ID_BCM5705: return "5705"; case PHY_ID_BCM5750: return "5750"; @@ -283,7 +283,7 @@ case PHY_ID_BCM5752: return "5752"; case PHY_ID_BCM5714: return "5714"; case PHY_ID_BCM5780: return "5780"; -@@ -13214,6 +13293,13 @@ static int __devinit tg3_init_one(struct +@@ -13214,6 +13294,13 @@ static int __devinit tg3_init_one(struct tp->msg_enable = tg3_debug; else tp->msg_enable = TG3_DEF_MSG_ENABLE; |