git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'core/xen' into x86/urgent
[pandora-kernel.git]
/
drivers
/
net
/
smc91x.h
diff --git
a/drivers/net/smc91x.h
b/drivers/net/smc91x.h
index
3e7c6a3
..
c4ccd12
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