diff options
| author |   Paul Mackerras <paulus@samba.org> | 2007-05-08 13:37:51 +1000 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2007-05-08 13:37:51 +1000 |
| commit | 02bbc0f09c90cefdb2837605c96a66c5ce4ba2e1 (patch) | |
| tree | 04ef573cd4de095c500c9fc3477f4278c0b36300 /drivers/net/tulip/timer.c | |
| parent | [POWERPC] Holly bootwrapper (diff) | |
| parent | Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6 (diff) | |
| download | linux-dev-02bbc0f09c90cefdb2837605c96a66c5ce4ba2e1.tar.xz linux-dev-02bbc0f09c90cefdb2837605c96a66c5ce4ba2e1.zip | |
Merge branch 'linux-2.6'
Diffstat (limited to 'drivers/net/tulip/timer.c')
| -rw-r--r-- | drivers/net/tulip/timer.c | 1 |
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" |