projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik...
[powerpc.git]
/
drivers
/
net
/
ixp2000
/
ixpdev.c
diff --git
a/drivers/net/ixp2000/ixpdev.c
b/drivers/net/ixp2000/ixpdev.c
index
09f03f4
..
77f104a
100644
(file)
--- a/
drivers/net/ixp2000/ixpdev.c
+++ b/
drivers/net/ixp2000/ixpdev.c
@@
-16,7
+16,7
@@
#include <linux/etherdevice.h>
#include <linux/init.h>
#include <linux/moduleparam.h>
-#include <asm/
arch
/uengine.h>
+#include <asm/
hardware
/uengine.h>
#include <asm/mach-types.h>
#include <asm/io.h>
#include "ixp2400_rx.ucode"