Merge branch 'master' into upstream

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

diff --git a/drivers/net/chelsio/common.h b/drivers/net/chelsio/common.h
index f09348802b46fb8fabe0f9535e6808c68b59bbee..5d9dd14427c5f30ac27d777c684e0b7c3d5d0d66 100644 (file)
--- a/drivers/net/chelsio/common.h
+++ b/drivers/net/chelsio/common.h
@@ -39,7 +39,6 @@
 #ifndef _CXGB_COMMON_H_
 #define _CXGB_COMMON_H_
 
-#include <linux/config.h>
 #include <linux/module.h>
 #include <linux/netdevice.h>
 #include <linux/types.h>
@@ -88,7 +87,7 @@ struct t1_rx_mode {
 
 static inline u8 *t1_get_next_mcaddr(struct t1_rx_mode *rm)
 {
-       u8 *addr = 0;
+       u8 *addr = NULL;
 
        if (rm->idx++ < rm->dev->mc_count) {
                addr = rm->list->dmi_addr;
@@ -190,7 +189,7 @@ struct sge;
 struct peespi;
 
 struct adapter {
-       u8 *regs;
+       u8 __iomem *regs;
        struct pci_dev *pdev;
        unsigned long registered_device_map;
        unsigned long open_device_map;