Merge git://git.linux-nfs.org/pub/linux/nfs-2.6

[~andy/linux] / drivers / net / gt96100eth.h

diff --git a/drivers/net/gt96100eth.h b/drivers/net/gt96100eth.h
index 2f4bfd4dacbee3dc86220718c4c4aa2d8f013a7e..3b62a87c7d7fec6c0d7e6b13f1069f9a7b0955ac 100644 (file)
--- a/drivers/net/gt96100eth.h
+++ b/drivers/net/gt96100eth.h
@@ -27,7 +27,6 @@
 #ifndef _GT96100ETH_H
 #define _GT96100ETH_H
 
-#include <linux/config.h>
 #include <asm/galileo-boards/gt96100.h>
 
 #define dbg(lvl, format, arg...) \
@@ -214,7 +213,7 @@ typedef struct {
        u32 cmdstat;
        u32 next;
        u32 buff_ptr;
-} gt96100_td_t __attribute__ ((packed));
+} __attribute__ ((packed)) gt96100_td_t;
 
 typedef struct {
 #ifdef DESC_BE
@@ -227,7 +226,7 @@ typedef struct {
        u32 cmdstat;
        u32 next;
        u32 buff_ptr;
-} gt96100_rd_t __attribute__ ((packed));
+} __attribute__ ((packed)) gt96100_rd_t;
 
 
 /* Values for the Tx command-status descriptor entry. */
@@ -332,7 +331,6 @@ struct gt96100_private {
        mib_counters_t mib;
        struct net_device_stats stats;
 
-       int io_size;
        int port_num;  // 0 or 1
        int chip_rev;
        u32 port_offset;
@@ -341,7 +339,6 @@ struct gt96100_private {
        u32 last_psr; // last value of the port status register
 
        int options;     /* User-settable misc. driver options. */
-       int drv_flags;
        struct timer_list timer;
        spinlock_t lock; /* Serialise access to device */
 };