Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes...

[linux-2.6-omap-h63xx.git] / drivers / net / qlge / qlge.h

diff --git a/drivers/net/qlge/qlge.h b/drivers/net/qlge/qlge.h
index c37ea436c9189adebf24bb579ba68e0659eae184..ba2e1c5b6bcf8c0cf5b37e49b993d3ae3f82bb44 100644 (file)
--- a/drivers/net/qlge/qlge.h
+++ b/drivers/net/qlge/qlge.h
@@ -58,7 +58,7 @@
  */
 #if (PAGE_SHIFT == 12) || (PAGE_SHIFT == 13)   /* 4k & 8k pages */
 #define TX_DESC_PER_OAL ((MAX_SKB_FRAGS - TX_DESC_PER_IOCB) + 2)
-#elif (PAGE_SHIFT == 16)       /* 64k pages */
+#else /* all other page sizes */
 #define TX_DESC_PER_OAL 0
 #endif
 
@@ -1375,7 +1375,6 @@ struct ql_adapter {
        spinlock_t adapter_lock;
        spinlock_t hw_lock;
        spinlock_t stats_lock;
-       spinlock_t legacy_lock; /* used for maintaining legacy intr sync */
 
        /* PCI Bus Relative Register Addresses */
        void __iomem *reg_base;
@@ -1399,8 +1398,6 @@ struct ql_adapter {
        struct msix_entry *msi_x_entry;
        struct intr_context intr_context[MAX_RX_RINGS];
 
-       int (*legacy_check) (struct ql_adapter *);
-
        int tx_ring_count;      /* One per online CPU. */
        u32 rss_ring_first_cq_id;/* index of first inbound (rss) rx_ring */
        u32 rss_ring_count;     /* One per online CPU.  */
@@ -1502,7 +1499,7 @@ void ql_mpi_work(struct work_struct *work);
 void ql_mpi_reset_work(struct work_struct *work);
 int ql_wait_reg_rdy(struct ql_adapter *qdev, u32 reg, u32 bit, u32 ebit);
 void ql_queue_asic_error(struct ql_adapter *qdev);
-void ql_enable_completion_interrupt(struct ql_adapter *qdev, u32 intr);
+u32 ql_enable_completion_interrupt(struct ql_adapter *qdev, u32 intr);
 void ql_set_ethtool_ops(struct net_device *ndev);
 int ql_read_xgmac_reg64(struct ql_adapter *qdev, u32 reg, u64 *data);