diff options
| author | Paul Mackerras <paulus@samba.org> | 2007-05-08 05:37:51 +0200 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2007-05-08 05:37:51 +0200 |
| commit | 02bbc0f09c90cefdb2837605c96a66c5ce4ba2e1 (patch) | |
| tree | 04ef573cd4de095c500c9fc3477f4278c0b36300 /arch/ppc/8xx_io/enet.c | |
| parent | [POWERPC] Holly bootwrapper (diff) | |
| parent | Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6 (diff) | |
| download | linux-02bbc0f09c90cefdb2837605c96a66c5ce4ba2e1.tar.xz linux-02bbc0f09c90cefdb2837605c96a66c5ce4ba2e1.zip | |
Merge branch 'linux-2.6'
Diffstat (limited to 'arch/ppc/8xx_io/enet.c')
| -rw-r--r-- | arch/ppc/8xx_io/enet.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/ppc/8xx_io/enet.c b/arch/ppc/8xx_io/enet.c index bfa3f52996d1..e58288e14369 100644 --- a/arch/ppc/8xx_io/enet.c +++ b/arch/ppc/8xx_io/enet.c @@ -30,7 +30,6 @@ #include <linux/ioport.h> #include <linux/slab.h> #include <linux/interrupt.h> -#include <linux/pci.h> #include <linux/init.h> #include <linux/delay.h> #include <linux/netdevice.h> |