diff -urN RC13-git3-s2io-u64/drivers/net/chelsio/common.h RC13-git3-chelsio/drivers/net/chelsio/common.h
--- RC13-git3-s2io-u64/drivers/net/chelsio/common.h	2005-09-02 14:09:46.000000000 -0400
+++ RC13-git3-chelsio/drivers/net/chelsio/common.h	2005-09-04 08:52:43.000000000 -0400
@@ -88,7 +88,7 @@
 
 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 +190,7 @@
 struct peespi;
 
 struct adapter {
-	u8 *regs;
+	u8 __iomem *regs;
 	struct pci_dev *pdev;
 	unsigned long registered_device_map;
 	unsigned long open_device_map;
diff -urN RC13-git3-s2io-u64/drivers/net/chelsio/cxgb2.c RC13-git3-chelsio/drivers/net/chelsio/cxgb2.c
--- RC13-git3-s2io-u64/drivers/net/chelsio/cxgb2.c	2005-09-02 14:09:46.000000000 -0400
+++ RC13-git3-chelsio/drivers/net/chelsio/cxgb2.c	2005-09-04 08:52:43.000000000 -0400
@@ -824,7 +824,7 @@
 static int t1_ioctl(struct net_device *dev, struct ifreq *req, int cmd)
 {
         struct adapter *adapter = dev->priv;
-        struct mii_ioctl_data *data = (struct mii_ioctl_data *)&req->ifr_data;
+        struct mii_ioctl_data *data = if_mii(req);
 
 	switch (cmd) {
         case SIOCGMIIPHY: