diff options
author | Wim Van Sebroeck <wim@iguana.be> | 2007-05-11 21:03:13 +0200 |
---|---|---|
committer | Wim Van Sebroeck <wim@iguana.be> | 2007-05-11 21:03:13 +0200 |
commit | 5c34202b8bf942da411b6599668a76b07449bbfd (patch) | |
tree | 5719c361321eaddc8e4f1b0c8a7994f0e9a6fdd3 /drivers/net/tulip/21142.c | |
parent | [WATCHDOG] iTCO_wdt.c - fix ACPI Base register (diff) | |
parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial (diff) | |
download | linux-5c34202b8bf942da411b6599668a76b07449bbfd.tar.xz linux-5c34202b8bf942da411b6599668a76b07449bbfd.zip |
Merge /pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'drivers/net/tulip/21142.c')
-rw-r--r-- | drivers/net/tulip/21142.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/net/tulip/21142.c b/drivers/net/tulip/21142.c index 942b839ccc5b..6c400ccd38b4 100644 --- a/drivers/net/tulip/21142.c +++ b/drivers/net/tulip/21142.c @@ -14,7 +14,6 @@ */ -#include <linux/pci.h> #include <linux/delay.h> #include "tulip.h" |