summaryrefslogtreecommitdiffstats
path: root/drivers/net/tulip/timer.c
diff options
context:
space:
mode:
authorWim Van Sebroeck <wim@iguana.be>2007-05-11 21:03:13 +0200
committerWim Van Sebroeck <wim@iguana.be>2007-05-11 21:03:13 +0200
commit5c34202b8bf942da411b6599668a76b07449bbfd (patch)
tree5719c361321eaddc8e4f1b0c8a7994f0e9a6fdd3 /drivers/net/tulip/timer.c
parent[WATCHDOG] iTCO_wdt.c - fix ACPI Base register (diff)
parentMerge git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial (diff)
downloadlinux-5c34202b8bf942da411b6599668a76b07449bbfd.tar.xz
linux-5c34202b8bf942da411b6599668a76b07449bbfd.zip
Merge /pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'drivers/net/tulip/timer.c')
-rw-r--r--drivers/net/tulip/timer.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/net/tulip/timer.c b/drivers/net/tulip/timer.c
index df326fe1cc8f..d2c1f42109b0 100644
--- a/drivers/net/tulip/timer.c
+++ b/drivers/net/tulip/timer.c
@@ -14,7 +14,6 @@
*/
-#include <linux/pci.h>
#include "tulip.h"