Merge master.kernel.org:/pub/scm/linux/kernel/git/davej/cpufreq

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

diff --git a/drivers/net/ixgb/ixgb.h b/drivers/net/ixgb/ixgb.h
index cf30a1059ce02f1808b4cd8251366df938958b35..3569d5b0338868e0d6be8259f383eda2b7caa493 100644 (file)
--- a/drivers/net/ixgb/ixgb.h
+++ b/drivers/net/ixgb/ixgb.h
@@ -111,9 +111,6 @@ struct ixgb_adapter;
 /* How many Rx Buffers do we bundle into one write to the hardware ? */
 #define IXGB_RX_BUFFER_WRITE   8       /* Must be power of 2 */
 
-/* only works for sizes that are powers of 2 */
-#define IXGB_ROUNDUP(i, size) ((i) = (((i) + (size) - 1) & ~((size) - 1)))
-
 /* wrapper around a pointer to a socket buffer,
  * so a DMA handle can be stored along with the buffer */
 struct ixgb_buffer {
@@ -196,8 +193,6 @@ struct ixgb_adapter {
        u16 msg_enable;
        struct ixgb_hw_stats stats;
        uint32_t alloc_rx_buff_failed;
-#ifdef CONFIG_PCI_MSI
        boolean_t have_msi;
-#endif
 };
 #endif /* _IXGB_H_ */