X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=drivers%2Fnet%2Fsmc911x.h;h=2abfc284519829ee05856b26b80c0ce45f2e27b5;hb=e2205a156f4dd727097f7f492bf03aa8920b0071;hp=7cc7cd7e99cde913fb29ab39f7f1c817cccd74a8;hpb=1ae9d2f4d776bd7e5f64d957216051cd36eb6802;p=linux-2.6

diff --git a/drivers/net/smc911x.h b/drivers/net/smc911x.h
index 7cc7cd7e99..2abfc28451 100644
--- a/drivers/net/smc911x.h
+++ b/drivers/net/smc911x.h
@@ -79,7 +79,6 @@ struct smc911x_local {
 
 	/* work queue */
 	struct work_struct phy_configure;
-	int work_pending;
 
 	int tx_throttle;
 	spinlock_t lock;
@@ -223,7 +222,7 @@ static inline void SMC_outsl(struct smc911x_local *lp, int reg,
  */
 #include <linux/dma-mapping.h>
 #include <asm/dma.h>
-#include <asm/arch/pxa-regs.h>
+#include <mach/pxa-regs.h>
 
 static dma_addr_t rx_dmabuf, tx_dmabuf;
 static int rx_dmalen, tx_dmalen;