Merge branch 'fix/asoc' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6

[pandora-kernel.git] / drivers / net / ibmlana.h

diff --git a/drivers/net/ibmlana.h b/drivers/net/ibmlana.h
index 6b58bab..accd5ef 100644 (file)
--- a/drivers/net/ibmlana.h
+++ b/drivers/net/ibmlana.h
@@ -26,7 +26,6 @@ typedef enum {
 
 typedef struct {
        unsigned int slot;              /* MCA-Slot-#                       */
-       struct net_device_stats stat;   /* packet statistics            */
        int realirq;                    /* memorizes actual IRQ, even when
                                           currently not allocated          */
        ibmlana_medium medium;          /* physical cannector               */
@@ -91,7 +90,7 @@ typedef struct {
 #define RCREG_ERR        0x8000        /* accept damaged and collided pkts */
 #define RCREG_RNT        0x4000        /* accept packets that are < 64     */
 #define RCREG_BRD        0x2000        /* accept broadcasts                */
-#define RCREG_PRO        0x1000        /* promiscous mode                  */
+#define RCREG_PRO        0x1000        /* promiscuous mode                  */
 #define RCREG_AMC        0x0800        /* accept all multicasts            */
 #define RCREG_LB_NONE    0x0000        /* no loopback                      */
 #define RCREG_LB_MAC     0x0200        /* MAC loopback                     */