Merge current mainline tree into linux-omap tree

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

diff --git a/drivers/net/smc911x.h b/drivers/net/smc911x.h
index 07e7af89fa0bec81cb642b2a910e541d13e1e462..b4d69c7310439a91a4303bc477642a5a831aebaa 100644 (file)
--- a/drivers/net/smc911x.h
+++ b/drivers/net/smc911x.h
@@ -232,7 +232,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;