aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/brcm47xx/patches-2.6.30
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@hauke-m.de>2010-02-20 19:31:34 +0000
committerHauke Mehrtens <hauke@hauke-m.de>2010-02-20 19:31:34 +0000
commit7524480b8253970fef0a3317bda0887a9fc83bce (patch)
tree5059204ea8310c758cc16178c737981a2f1a8e4a /target/linux/brcm47xx/patches-2.6.30
parent046c32e6bf33d365e812ee5ea5ee0409d49f3d0d (diff)
downloadupstream-7524480b8253970fef0a3317bda0887a9fc83bce.tar.gz
upstream-7524480b8253970fef0a3317bda0887a9fc83bce.tar.bz2
upstream-7524480b8253970fef0a3317bda0887a9fc83bce.zip
Fix build warnings
SVN-Revision: 19782
Diffstat (limited to 'target/linux/brcm47xx/patches-2.6.30')
-rw-r--r--target/linux/brcm47xx/patches-2.6.30/700-ssb-gigabit-ethernet-driver.patch10
1 files changed, 1 insertions, 9 deletions
diff --git a/target/linux/brcm47xx/patches-2.6.30/700-ssb-gigabit-ethernet-driver.patch b/target/linux/brcm47xx/patches-2.6.30/700-ssb-gigabit-ethernet-driver.patch
index a524dff5d2..f56ae8e71c 100644
--- a/target/linux/brcm47xx/patches-2.6.30/700-ssb-gigabit-ethernet-driver.patch
+++ b/target/linux/brcm47xx/patches-2.6.30/700-ssb-gigabit-ethernet-driver.patch
@@ -98,7 +98,7 @@
/* Workaround for unstable PLL clock */
- if ((GET_CHIP_REV(tp->pci_chip_rev_id) == CHIPREV_5750_AX) ||
- (GET_CHIP_REV(tp->pci_chip_rev_id) == CHIPREV_5750_BX)) {
-+ if ((tp->phy_id & PHY_ID_MASK != PHY_ID_BCM5750_2) &&
++ if ((tp->phy_id & PHY_ID_MASK) != PHY_ID_BCM5750_2 &&
+ /* !!! FIXME !!! */
+ ((GET_CHIP_REV(tp->pci_chip_rev_id) == CHIPREV_5750_AX) ||
+ (GET_CHIP_REV(tp->pci_chip_rev_id) == CHIPREV_5750_BX))) {
@@ -252,14 +252,6 @@
if (tp->tg3_flags & TG3_FLAG_EEPROM_WRITE_PROT) {
tw32_f(GRC_LOCAL_CTRL, tp->grc_local_ctrl &
~GRC_LCLCTRL_GPIO_OUTPUT1);
-@@ -12063,7 +12133,6 @@ static int __devinit tg3_get_invariants(
- tp->write32 = tg3_write_flush_reg32;
- }
-
--
- if ((tp->tg3_flags & TG3_FLAG_TXD_MBOX_HWBUG) ||
- (tp->tg3_flags & TG3_FLAG_MBOX_WRITE_REORDER)) {
- tp->write32_tx_mbox = tg3_write32_tx_mbox;
@@ -12099,6 +12168,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;