projects
/
linux-2.6-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge commit 'v2.6.27-rc3' into x86/xsave
[linux-2.6-block.git]
/
drivers
/
net
/
ixp2000
/
ixp2400-msf.c
diff --git
a/drivers/net/ixp2000/ixp2400-msf.c
b/drivers/net/ixp2000/ixp2400-msf.c
index 9ec38eebfb5629fed388f25347cd2501bfe1f5e7..f5ffd7e05d268ad509b5204b5515c02ae0b8c4fc 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"