diff options
author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-11-07 20:23:46 -0800 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-11-07 20:23:46 -0800 |
commit | f093182d313edde9b1f86dbdaf40ba4da2dbd0e7 (patch) | |
tree | ecfc614d514bd5b43a98cf4c62fdd2f47d86e33c /arch/powerpc/sysdev/u3_iommu.c | |
parent | d27ba47e7e8c466c18983a1779d611f82d6a354f (diff) | |
parent | 76c8e25b905f99be5ddbe999597ba7c2c33ec64b (diff) | |
download | kernel-crypto-f093182d313edde9b1f86dbdaf40ba4da2dbd0e7.tar.gz kernel-crypto-f093182d313edde9b1f86dbdaf40ba4da2dbd0e7.tar.xz kernel-crypto-f093182d313edde9b1f86dbdaf40ba4da2dbd0e7.zip |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc-merge
Diffstat (limited to 'arch/powerpc/sysdev/u3_iommu.c')
-rw-r--r-- | arch/powerpc/sysdev/u3_iommu.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/powerpc/sysdev/u3_iommu.c b/arch/powerpc/sysdev/u3_iommu.c index 607722178c1..543d6590981 100644 --- a/arch/powerpc/sysdev/u3_iommu.c +++ b/arch/powerpc/sysdev/u3_iommu.c @@ -37,7 +37,6 @@ #include <linux/vmalloc.h> #include <asm/io.h> #include <asm/prom.h> -#include <asm/ppcdebug.h> #include <asm/iommu.h> #include <asm/pci-bridge.h> #include <asm/machdep.h> |