diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2005-11-02 02:15:43 -0500 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2005-11-02 02:15:43 -0500 |
| commit | 2be7a906752abf8dce9350c23b6d1036049a5d3e (patch) | |
| tree | ef178fa5801bdce24938819086662bb747d8c0c2 /arch/powerpc/sysdev/u3_iommu.c | |
| parent | aaf8a7a2949481482200686c7bd3852e5be2e093 (diff) | |
| parent | fbf1769d08a8b085834dceb228540153ac2cd534 (diff) | |
Merge Paulus' tree
Diffstat (limited to 'arch/powerpc/sysdev/u3_iommu.c')
| -rw-r--r-- | arch/powerpc/sysdev/u3_iommu.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/arch/powerpc/sysdev/u3_iommu.c b/arch/powerpc/sysdev/u3_iommu.c index fba871a1bda5..607722178c1a 100644 --- a/arch/powerpc/sysdev/u3_iommu.c +++ b/arch/powerpc/sysdev/u3_iommu.c | |||
| @@ -1,5 +1,5 @@ | |||
| 1 | /* | 1 | /* |
| 2 | * arch/ppc64/kernel/u3_iommu.c | 2 | * arch/powerpc/sysdev/u3_iommu.c |
| 3 | * | 3 | * |
| 4 | * Copyright (C) 2004 Olof Johansson <olof@austin.ibm.com>, IBM Corporation | 4 | * Copyright (C) 2004 Olof Johansson <olof@austin.ibm.com>, IBM Corporation |
| 5 | * | 5 | * |
| @@ -44,9 +44,10 @@ | |||
| 44 | #include <asm/abs_addr.h> | 44 | #include <asm/abs_addr.h> |
| 45 | #include <asm/cacheflush.h> | 45 | #include <asm/cacheflush.h> |
| 46 | #include <asm/lmb.h> | 46 | #include <asm/lmb.h> |
| 47 | #include <asm/dart.h> | ||
| 48 | #include <asm/ppc-pci.h> | 47 | #include <asm/ppc-pci.h> |
| 49 | 48 | ||
| 49 | #include "dart.h" | ||
| 50 | |||
| 50 | extern int iommu_force_on; | 51 | extern int iommu_force_on; |
| 51 | 52 | ||
| 52 | /* Physical base address and size of the DART table */ | 53 | /* Physical base address and size of the DART table */ |