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: (217 commits)
  net/ieee80211: fix more crypto-related build breakage
  [PATCH] Spidernet: add ethtool -S (show statistics)
  [NET] GT96100: Delete bitrotting ethernet driver
  [PATCH] mv643xx_eth: restrict to 32-bit PPC_MULTIPLATFORM
  [PATCH] Cirrus Logic ep93xx ethernet driver
  r8169: the MMIO region of the 8167 stands behin BAR#1
  e1000, ixgb: Remove pointless wrappers
  [PATCH] Remove powerpc specific parts of 3c509 driver
  [PATCH] s2io: Switch to pci_get_device
  [PATCH] gt96100: move to pci_get_device API
  [PATCH] ehea: bugfix for register access functions
  [PATCH] e1000 disable device on PCI error
  drivers/net/phy/fixed: #if 0 some incomplete code
  drivers/net: const-ify ethtool_ops declarations
  [PATCH] ethtool: allow const ethtool_ops
  [PATCH] sky2: big endian
  [PATCH] sky2: fiber support
  [PATCH] sky2: tx pause bug fix
  drivers/net: Trim trailing whitespace
  [PATCH] ehea: IBM eHEA Ethernet Device Driver
  ...

Manually resolved conflicts in drivers/net/ixgb/ixgb_main.c and
drivers/net/sky2.c related to CHECKSUM_HW/CHECKSUM_PARTIAL changes by
commit 84fa7933a33f806bbbaae6775e87459b1ec584c0 that just happened to be
next to unrelated changes in this update.

1 files changed, 7 insertions, 7 deletions

diff --git a/drivers/net/sunhme.c b/drivers/net/sunhme.c
index 17981da22730..f05eea53623b 100644
--- a/drivers/net/sunhme.c
+++ b/drivers/net/sunhme.c
@@ -505,7 +505,7 @@ static void happy_meal_tcvr_write(struct happy_meal *hp,
                                   unsigned short value)
 {
         int tries = TCVR_WRITE_TRIES;
-        
+
         ASD(("happy_meal_tcvr_write: reg=0x%02x value=%04x\n", reg, value));
 
         /* Welcome to Sun Microsystems, can I take your order please? */
@@ -1778,7 +1778,7 @@ static void happy_meal_set_initial_advertisement(struct happy_meal *hp)
 static int happy_meal_is_not_so_happy(struct happy_meal *hp, u32 status)
 {
         int reset = 0;
-        
+
         /* Only print messages for non-counter related interrupts. */
         if (status & (GREG_STAT_STSTERR | GREG_STAT_TFIFO_UND |
                       GREG_STAT_MAXPKTERR | GREG_STAT_RXERR |
@@ -2512,7 +2512,7 @@ static u32 hme_get_link(struct net_device *dev)
         return (hp->sw_bmsr & BMSR_LSTATUS);
 }
 
-static struct ethtool_ops hme_ethtool_ops = {
+static const struct ethtool_ops hme_ethtool_ops = {
         .get_settings           = hme_get_settings,
         .set_settings           = hme_set_settings,
         .get_drvinfo            = hme_get_drvinfo,
@@ -3002,7 +3002,7 @@ static int __devinit happy_meal_pci_probe(struct pci_dev *pdev,
                 printk(KERN_ERR "happymeal(PCI): Some PCI device info missing\n");
                 return -ENODEV;
         }
-        
+
         strcpy(prom_name, pcp->prom_node->name);
 #else
         if (is_quattro_p(pdev))
@@ -3046,7 +3046,7 @@ static int __devinit happy_meal_pci_probe(struct pci_dev *pdev,
                 hp->qfe_parent = qp;
                 hp->qfe_ent = qfe_slot;
                 qp->happy_meals[qfe_slot] = dev;
-        }               
+        }
 
         hpreg_res = pci_resource_start(pdev, 0);
         err = -ENODEV;
@@ -3090,7 +3090,7 @@ static int __devinit happy_meal_pci_probe(struct pci_dev *pdev,
                 get_hme_mac_nonsparc(pdev, &dev->dev_addr[0]);
 #endif
         }
-        
+
         /* Layout registers. */
         hp->gregs      = (hpreg_base + 0x0000UL);
         hp->etxregs    = (hpreg_base + 0x2000UL);
@@ -3201,7 +3201,7 @@ static int __devinit happy_meal_pci_probe(struct pci_dev *pdev,
                     qpdev->device == PCI_DEVICE_ID_DEC_21153)
                         printk("DEC 21153 PCI Bridge\n");
                 else
-                        printk("unknown bridge %04x.%04x\n", 
+                        printk("unknown bridge %04x.%04x\n",
                                 qpdev->vendor, qpdev->device);
         }