projects / openwrt / staging / ynezz.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 046c32e)
Fix build warnings
authorHauke Mehrtens <hauke@hauke-m.de>
Sat, 20 Feb 2010 19:31:34 +0000 (19:31 +0000)
committerHauke Mehrtens <hauke@hauke-m.de>
Sat, 20 Feb 2010 19:31:34 +0000 (19:31 +0000)
SVN-Revision: 19782

target/linux/brcm47xx/patches-2.6.30/700-ssb-gigabit-ethernet-driver.patch patch | blob | history
target/linux/brcm47xx/patches-2.6.31/700-ssb-gigabit-ethernet-driver.patch patch | blob | history
target/linux/brcm47xx/patches-2.6.32/260-ohci-set-dma-mask.patch patch | blob | history
target/linux/brcm47xx/patches-2.6.32/700-ssb-gigabit-ethernet-driver.patch patch | blob | history

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 a524dff5d27999f6ae09311e8f9f83f8934f1aee..f56ae8e71cad6fbd415ef14649f2cdaebdfdff2a 100644 (file)
--- 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;
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 4a47e63a79303e77a43ff9b2ccf44e40b8f98d2f..02733438855124e3e7343383faeab0251901fed2 100644 (file)
--- 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
@@ -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);
-@@ -12100,7 +12170,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;
 @@ -12136,6 +12205,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;
diff --git a/target/linux/brcm47xx/patches-2.6.32/260-ohci-set-dma-mask.patch b/target/linux/brcm47xx/patches-2.6.32/260-ohci-set-dma-mask.patch
index 50dcd5718ee5d1c557d29a2da744eea790b2fb4f..9627798472c158e765c4e42ddbc1f3e978b433cb 100644 (file)
--- a/target/linux/brcm47xx/patches-2.6.32/260-ohci-set-dma-mask.patch
+++ b/target/linux/brcm47xx/patches-2.6.32/260-ohci-set-dma-mask.patch
@@ -8,7 +8,7 @@
        int err = -ENOMEM;
        u32 tmp, flags = 0;
  
-+      if (ssb_dma_set_mask(dev, DMA_32BIT_MASK))
++      if (ssb_dma_set_mask(dev, DMA_BIT_MASK(32)))
 +              return -EOPNOTSUPP;
 +
        if (dev->id.coreid == SSB_DEV_USB11_HOSTDEV) {
diff --git a/target/linux/brcm47xx/patches-2.6.32/700-ssb-gigabit-ethernet-driver.patch b/target/linux/brcm47xx/patches-2.6.32/700-ssb-gigabit-ethernet-driver.patch
index f7deb54e171c1facbcb29c3e759544e0a2a09259..de25019506b0ddc34d3b492445589935cf0688cc 100644 (file)
--- a/target/linux/brcm47xx/patches-2.6.32/700-ssb-gigabit-ethernet-driver.patch
+++ b/target/linux/brcm47xx/patches-2.6.32/700-ssb-gigabit-ethernet-driver.patch
@@ -80,7 +80,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))) {
Staging tree of Petr Stetiar