projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6
[cascardo/linux.git]
/
drivers
/
net
/
smc911x.h
diff --git
a/drivers/net/smc911x.h
b/drivers/net/smc911x.h
index
76c17c2
..
2abfc28
100644
(file)
--- a/
drivers/net/smc911x.h
+++ b/
drivers/net/smc911x.h
@@
-222,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/ar
ch/pxa-regs.h>
+#include <
ma
ch/pxa-regs.h>
static dma_addr_t rx_dmabuf, tx_dmabuf;
static int rx_dmalen, tx_dmalen;