Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6

* 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6: (75 commits)
  Ethernet driver for EISA only SNI RM200/RM400 machines
  Extract chip specific code out of lasi_82596.c
  ehea: Whitespace cleanup
  pasemi_mac: Fix TX interrupt threshold
  spidernet: Replace literal with const
  r8169: perform RX config change after mac filtering
  r8169: mac address change support
  r8169: display some extra debug information during startup
  r8169: add endianess annotations to [RT]xDesc
  r8169: align the IP header when there is no DMA constraint
  r8169: add bit description for the TxPoll register
  r8169: cleanup
  r8169: remove the media option
  r8169: small 8101 comment
  r8169: confusion between hardware and IP header alignment
  r8169: merge with version 8.001.00 of Realtek's r8168 driver
  r8169: merge with version 6.001.00 of Realtek's r8169 driver
  r8169: prettify mac_version
  r8169: populate the hw_start handler for the 8110
  r8169: populate the hw_start handler for the 8168
  ...

1 files changed, 3 insertions, 8 deletions

diff --git a/drivers/net/8139cp.c b/drivers/net/8139cp.c
index a804965e6542..58bbc3e6d0de 100644
--- a/drivers/net/8139cp.c
+++ b/drivers/net/8139cp.c
@@ -107,11 +107,6 @@ MODULE_PARM_DESC (multicast_filter_limit, "8139cp: maximum number of filtered mu
 
 #define PFX                     DRV_NAME ": "
 
-#ifndef TRUE
-#define FALSE 0
-#define TRUE (!FALSE)
-#endif
-
 #define CP_DEF_MSG_ENABLE       (NETIF_MSG_DRV          | \
                                  NETIF_MSG_PROBE        | \
                                  NETIF_MSG_LINK)
@@ -661,7 +656,7 @@ static irqreturn_t cp_interrupt (int irq, void *dev_instance)
         if (status & (TxOK | TxErr | TxEmpty | SWInt))
                 cp_tx(cp);
         if (status & LinkChg)
-                mii_check_media(&cp->mii_if, netif_msg_link(cp), FALSE);
+                mii_check_media(&cp->mii_if, netif_msg_link(cp), false);
 
         spin_unlock(&cp->lock);
 
@@ -1188,7 +1183,7 @@ static int cp_open (struct net_device *dev)
                 goto err_out_hw;
 
         netif_carrier_off(dev);
-        mii_check_media(&cp->mii_if, netif_msg_link(cp), TRUE);
+        mii_check_media(&cp->mii_if, netif_msg_link(cp), true);
         netif_start_queue(dev);
 
         return 0;
@@ -2050,7 +2045,7 @@ static int cp_resume (struct pci_dev *pdev)
 
         spin_lock_irqsave (&cp->lock, flags);
 
-        mii_check_media(&cp->mii_if, netif_msg_link(cp), FALSE);
+        mii_check_media(&cp->mii_if, netif_msg_link(cp), false);
 
         spin_unlock_irqrestore (&cp->lock, flags);