diff options
-rw-r--r-- | arch/powerpc/sysdev/dart.h (renamed from include/asm-ppc64/dart.h) | 6 | ||||
-rw-r--r-- | arch/powerpc/sysdev/u3_iommu.c | 5 |
2 files changed, 6 insertions, 5 deletions
diff --git a/include/asm-ppc64/dart.h b/arch/powerpc/sysdev/dart.h index cdf8a2dec05f..ea8f0d9eed8a 100644 --- a/include/asm-ppc64/dart.h +++ b/arch/powerpc/sysdev/dart.h | |||
@@ -16,8 +16,8 @@ | |||
16 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | 16 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA |
17 | */ | 17 | */ |
18 | 18 | ||
19 | #ifndef _ASM_DART_H | 19 | #ifndef _POWERPC_SYSDEV_DART_H |
20 | #define _ASM_DART_H | 20 | #define _POWERPC_SYSDEV_DART_H |
21 | 21 | ||
22 | 22 | ||
23 | /* physical base of DART registers */ | 23 | /* physical base of DART registers */ |
@@ -56,4 +56,4 @@ | |||
56 | #define DART_PAGE_FACTOR (PAGE_SHIFT - DART_PAGE_SHIFT) | 56 | #define DART_PAGE_FACTOR (PAGE_SHIFT - DART_PAGE_SHIFT) |
57 | 57 | ||
58 | 58 | ||
59 | #endif | 59 | #endif /* _POWERPC_SYSDEV_DART_H */ |
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 */ |