projects
/
linux-2.6-microblaze.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
[linux-2.6-microblaze.git]
/
drivers
/
net
/
ethernet
/
8390
/
etherh.c
diff --git
a/drivers/net/ethernet/8390/etherh.c
b/drivers/net/ethernet/8390/etherh.c
index
89cba45
..
8322c54
100644
(file)
--- a/
drivers/net/ethernet/8390/etherh.c
+++ b/
drivers/net/ethernet/8390/etherh.c
@@
-45,9
+45,9
@@
#include <linux/bitops.h>
#include <linux/jiffies.h>
-#include <asm/system.h>
#include <asm/ecard.h>
#include <asm/io.h>
+#include <asm/system_info.h>
#define EI_SHIFT(x) (ei_local->reg_offset[x])