projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'for-v3.4-rc1' of git://git.infradead.org/battery-2.6
[cascardo/linux.git]
/
drivers
/
net
/
tokenring
/
proteon.c
diff --git
a/drivers/net/tokenring/proteon.c
b/drivers/net/tokenring/proteon.c
index
8d362e6
..
62d90e4
100644
(file)
--- a/
drivers/net/tokenring/proteon.c
+++ b/
drivers/net/tokenring/proteon.c
@@
-31,7
+31,6
@@
static const char version[] = "proteon.c: v1.00 02/01/2003 by Jochen Friedrich\n
#include <linux/trdevice.h>
#include <linux/platform_device.h>
-#include <asm/system.h>
#include <asm/io.h>
#include <asm/irq.h>
#include <asm/pci.h>