From 9933f299d0e9e7b12ed4260669653d04d5e752c7 Mon Sep 17 00:00:00 2001 From: David Gibson Date: Wed, 2 Nov 2005 15:13:20 +1100 Subject: [PATCH] [PATCH] powerpc: Move dart.h asm-ppc64/dart.h is included in exactly one place - arch/powerpc/sysdev/u3_iommu.c. This patch, therefore, moves it into arch/powerpc/sysdev. While we're at it, update the #ifndef/#define protecting the include, and the filename in the comments of u3_iommu.c. Built and booted on pSeries and G5, built for ppc32 powermac. Signed-off-by: David Gibson Signed-off-by: Paul Mackerras --- {include/asm-ppc64 => arch/powerpc/sysdev}/dart.h | 6 +++--- arch/powerpc/sysdev/u3_iommu.c | 5 +++-- 2 files changed, 6 insertions(+), 5 deletions(-) rename {include/asm-ppc64 => arch/powerpc/sysdev}/dart.h (94%) diff --git a/include/asm-ppc64/dart.h b/arch/powerpc/sysdev/dart.h similarity index 94% rename from include/asm-ppc64/dart.h rename to 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 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#ifndef _ASM_DART_H -#define _ASM_DART_H +#ifndef _POWERPC_SYSDEV_DART_H +#define _POWERPC_SYSDEV_DART_H /* physical base of DART registers */ @@ -56,4 +56,4 @@ #define DART_PAGE_FACTOR (PAGE_SHIFT - DART_PAGE_SHIFT) -#endif +#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 @@ /* - * arch/ppc64/kernel/u3_iommu.c + * arch/powerpc/sysdev/u3_iommu.c * * Copyright (C) 2004 Olof Johansson , IBM Corporation * @@ -44,9 +44,10 @@ #include #include #include -#include #include +#include "dart.h" + extern int iommu_force_on; /* Physical base address and size of the DART table */ -- 2.34.1