Merge git://git.kernel.org/pub/scm/linux/kernel/git/kyle/parisc-2.6.29

[mv-sheeva.git] / drivers / net / smc91x.h

diff --git a/drivers/net/smc91x.h b/drivers/net/smc91x.h
index 3e7c6a3cbc650c8f0a39afa4bc49eb48f7aac191..c4ccd121bc9c648ba90a2bbf8e3c110e2bacb187 100644 (file)
--- a/drivers/net/smc91x.h
+++ b/drivers/net/smc91x.h
@@ -493,7 +493,8 @@ struct smc_local {
  * as RX which can overrun memory and lose packets.
  */
 #include <linux/dma-mapping.h>
-#include <asm/dma.h>
+#include <mach/dma.h>
+#include <mach/hardware.h>
 #include <mach/pxa-regs.h>
 
 #ifdef SMC_insl