Merge pobox.com:/garz/repo/netdev-2.6/ibmlana

into pobox.com:/garz/repo/net-drivers-2.6

drivers/net/ibmlana.h

@@ -37,6 +37,7 @@ typedef struct {
 		nexttxdescr,		/* last tx descriptor to be used    */
 		currtxdescr,		/* tx descriptor currently tx'ed    */
 		txused[TXBUFCNT];	/* busy flags                       */
+	void __iomem *base;
 	spinlock_t lock;
 } ibmlana_priv;