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/syslib | |
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/syslib')
-rw-r--r-- | arch/ppc/syslib/ppc4xx_sgdma.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/ppc/syslib/ppc4xx_sgdma.c b/arch/ppc/syslib/ppc4xx_sgdma.c index 93349e48bfbf..c4b369b50f9c 100644 --- a/arch/ppc/syslib/ppc4xx_sgdma.c +++ b/arch/ppc/syslib/ppc4xx_sgdma.c @@ -24,7 +24,6 @@ #include <linux/init.h> #include <linux/module.h> #include <linux/dma-mapping.h> -#include <linux/pci.h> #include <asm/system.h> #include <asm/io.h> |