diff options
author | Paul Mackerras <paulus@samba.org> | 2005-10-27 18:29:36 -0400 |
---|---|---|
committer | Paul Mackerras <paulus@samba.org> | 2005-10-27 18:29:36 -0400 |
commit | 09eee6347166a7baab74783999ef1bf23827647f (patch) | |
tree | 1a52a6c6645447f65afb4ae7a057ba037c5870f5 | |
parent | bfab1019b7e8b499dfc471a0dfc98b587420dda9 (diff) |
powerpc: Move U3 IOMMU driver to arch/powerpc/sysdev
Signed-off-by: Paul Mackerras <paulus@samba.org>
-rw-r--r-- | arch/powerpc/sysdev/Makefile | 1 | ||||
-rw-r--r-- | arch/powerpc/sysdev/u3_iommu.c (renamed from arch/ppc64/kernel/u3_iommu.c) | 0 | ||||
-rw-r--r-- | arch/ppc64/kernel/Makefile | 2 |
3 files changed, 1 insertions, 2 deletions
diff --git a/arch/powerpc/sysdev/Makefile b/arch/powerpc/sysdev/Makefile index d071ae875e25..8acd21dee05d 100644 --- a/arch/powerpc/sysdev/Makefile +++ b/arch/powerpc/sysdev/Makefile | |||
@@ -4,3 +4,4 @@ obj-$(CONFIG_PPC_I8259) += i8259.o | |||
4 | obj-$(CONFIG_PPC_MPC106) += grackle.o | 4 | obj-$(CONFIG_PPC_MPC106) += grackle.o |
5 | obj-$(CONFIG_BOOKE) += dcr.o | 5 | obj-$(CONFIG_BOOKE) += dcr.o |
6 | obj-$(CONFIG_40x) += dcr.o | 6 | obj-$(CONFIG_40x) += dcr.o |
7 | obj-$(CONFIG_U3_DART) += u3_iommu.o | ||
diff --git a/arch/ppc64/kernel/u3_iommu.c b/arch/powerpc/sysdev/u3_iommu.c index fba871a1bda5..fba871a1bda5 100644 --- a/arch/ppc64/kernel/u3_iommu.c +++ b/arch/powerpc/sysdev/u3_iommu.c | |||
diff --git a/arch/ppc64/kernel/Makefile b/arch/ppc64/kernel/Makefile index f2f60c9cc55f..863bd7d746fb 100644 --- a/arch/ppc64/kernel/Makefile +++ b/arch/ppc64/kernel/Makefile | |||
@@ -60,8 +60,6 @@ obj-$(CONFIG_PPC_PMAC) += udbg_scc.o | |||
60 | obj-$(CONFIG_PPC_MAPLE) += maple_setup.o maple_pci.o maple_time.o \ | 60 | obj-$(CONFIG_PPC_MAPLE) += maple_setup.o maple_pci.o maple_time.o \ |
61 | udbg_16550.o | 61 | udbg_16550.o |
62 | 62 | ||
63 | obj-$(CONFIG_U3_DART) += u3_iommu.o | ||
64 | |||
65 | ifdef CONFIG_SMP | 63 | ifdef CONFIG_SMP |
66 | obj-$(CONFIG_PPC_PMAC) += smp-tbsync.o | 64 | obj-$(CONFIG_PPC_PMAC) += smp-tbsync.o |
67 | obj-$(CONFIG_PPC_MAPLE) += smp-tbsync.o | 65 | obj-$(CONFIG_PPC_MAPLE) += smp-tbsync.o |