Fixed conflict

diff --git a/linux-2.6-001-bcm5720.patch b/linux-2.6-001-bcm5720.patch
index 7d4c223..4a374fa 100644 (file)
--- a/linux-2.6-001-bcm5720.patch
+++ b/linux-2.6-001-bcm5720.patch
@@ -62,9 +62,9 @@ diff -Nurb linux-2.6.32-27.planetlab.i686/drivers/net/tg3.c ../kernel-2.6/linux-
  
        if (GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5704 ||
            GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5714 ||
--          GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5717 {
-+          GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5717) || 
-+            GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5720) {
+-          GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5717) {
++          GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5717 || 
++            GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5720)
                struct net_device *dev_peer;
  
                dev_peer = pci_get_drvdata(tp->pdev_peer);