X-Git-Url: http://pilppa.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=drivers%2Fnet%2Fchelsio%2Fcommon.h;h=5d9dd14427c5f30ac27d777c684e0b7c3d5d0d66;hb=709cf0187d286cb1bf2c210e62bba98afdec859c;hp=f09348802b46fb8fabe0f9535e6808c68b59bbee;hpb=66f3767376e2bbffb4c2c78ea171e1fdcb62201b;p=linux-2.6-omap-h63xx.git

diff --git a/drivers/net/chelsio/common.h b/drivers/net/chelsio/common.h
index f09348802b4..5d9dd14427c 100644
--- 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;