diff options
| author | Paul Mackerras <paulus@samba.org> | 2008-02-26 05:08:45 -0500 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2008-02-26 05:08:45 -0500 |
| commit | f8303dd3db57bd7ab2062985ad7a9e898a8ac423 (patch) | |
| tree | b92086100ed44c8647dba61a21e560923daa336a /arch/powerpc/sysdev | |
| parent | bfa274e2436fc7ef72ef51c878083647f1cfd429 (diff) | |
| parent | 74b20dad1c4cc0fd13ceca62fbab808919e1a7ea (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/lmb-2.6
Diffstat (limited to 'arch/powerpc/sysdev')
| -rw-r--r-- | arch/powerpc/sysdev/dart_iommu.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/sysdev/dart_iommu.c b/arch/powerpc/sysdev/dart_iommu.c index e0e24b01e3a6..005c2ecf976f 100644 --- a/arch/powerpc/sysdev/dart_iommu.c +++ b/arch/powerpc/sysdev/dart_iommu.c | |||
| @@ -37,6 +37,7 @@ | |||
| 37 | #include <linux/dma-mapping.h> | 37 | #include <linux/dma-mapping.h> |
| 38 | #include <linux/vmalloc.h> | 38 | #include <linux/vmalloc.h> |
| 39 | #include <linux/suspend.h> | 39 | #include <linux/suspend.h> |
| 40 | #include <linux/lmb.h> | ||
| 40 | #include <asm/io.h> | 41 | #include <asm/io.h> |
| 41 | #include <asm/prom.h> | 42 | #include <asm/prom.h> |
| 42 | #include <asm/iommu.h> | 43 | #include <asm/iommu.h> |
| @@ -44,7 +45,6 @@ | |||
| 44 | #include <asm/machdep.h> | 45 | #include <asm/machdep.h> |
| 45 | #include <asm/abs_addr.h> | 46 | #include <asm/abs_addr.h> |
| 46 | #include <asm/cacheflush.h> | 47 | #include <asm/cacheflush.h> |
| 47 | #include <asm/lmb.h> | ||
| 48 | #include <asm/ppc-pci.h> | 48 | #include <asm/ppc-pci.h> |
| 49 | 49 | ||
| 50 | #include "dart.h" | 50 | #include "dart.h" |