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 'topic/asoc' into for-linus
[pandora-kernel.git]
/
drivers
/
net
/
ixp2000
/
ixp2400-msf.c
diff --git
a/drivers/net/ixp2000/ixp2400-msf.c
b/drivers/net/ixp2000/ixp2400-msf.c
index
9ec38ee
..
f5ffd7e
100644
(file)
--- a/
drivers/net/ixp2000/ixp2400-msf.c
+++ b/
drivers/net/ixp2000/ixp2400-msf.c
@@
-13,8
+13,8
@@
#include <linux/kernel.h>
#include <linux/init.h>
-#include <
asm
/hardware.h>
-#include <
asm/ar
ch/ixp2000-regs.h>
+#include <
mach
/hardware.h>
+#include <
ma
ch/ixp2000-regs.h>
#include <asm/delay.h>
#include <asm/io.h>
#include "ixp2400-msf.h"