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 branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211
[linux-2.6-block.git]
/
drivers
/
net
/
ethernet
/
realtek
/
atp.c
diff --git
a/drivers/net/ethernet/realtek/atp.c
b/drivers/net/ethernet/realtek/atp.c
index 46c1932048cbb459cc0f02547c78307caf73eacc..e02f04d7f3adb24112149238885a0b302a0d3faf 100644
(file)
--- a/
drivers/net/ethernet/realtek/atp.c
+++ b/
drivers/net/ethernet/realtek/atp.c
@@
-140,7
+140,6
@@
static int xcvr[NUM_UNITS]; /* The data transfer mode. */
#include <linux/delay.h>
#include <linux/bitops.h>
-#include <asm/system.h>
#include <asm/io.h>
#include <asm/dma.h>