diff options
-rw-r--r-- | arch/powerpc/sysdev/Makefile | 1 | ||||
-rw-r--r-- | arch/powerpc/sysdev/ipic.c (renamed from arch/ppc/syslib/ipic.c) | 0 | ||||
-rw-r--r-- | arch/powerpc/sysdev/ipic.h (renamed from arch/ppc/syslib/ipic.h) | 0 | ||||
-rw-r--r-- | arch/ppc/syslib/Makefile | 2 | ||||
-rw-r--r-- | include/asm-powerpc/ipic.h (renamed from include/asm-ppc/ipic.h) | 0 |
5 files changed, 2 insertions, 1 deletions
diff --git a/arch/powerpc/sysdev/Makefile b/arch/powerpc/sysdev/Makefile index 6b7efcfc352a..b3e3636a57b0 100644 --- a/arch/powerpc/sysdev/Makefile +++ b/arch/powerpc/sysdev/Makefile | |||
@@ -6,3 +6,4 @@ 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 | 7 | obj-$(CONFIG_U3_DART) += u3_iommu.o |
8 | obj-$(CONFIG_MMIO_NVRAM) += mmio_nvram.o | 8 | obj-$(CONFIG_MMIO_NVRAM) += mmio_nvram.o |
9 | obj-$(CONFIG_83xx) += ipic.o | ||
diff --git a/arch/ppc/syslib/ipic.c b/arch/powerpc/sysdev/ipic.c index 8f01e0f1d847..8f01e0f1d847 100644 --- a/arch/ppc/syslib/ipic.c +++ b/arch/powerpc/sysdev/ipic.c | |||
diff --git a/arch/ppc/syslib/ipic.h b/arch/powerpc/sysdev/ipic.h index a7ce7da8785c..a7ce7da8785c 100644 --- a/arch/ppc/syslib/ipic.h +++ b/arch/powerpc/sysdev/ipic.h | |||
diff --git a/arch/ppc/syslib/Makefile b/arch/ppc/syslib/Makefile index 5b7f2b80e56e..84ef03018d0e 100644 --- a/arch/ppc/syslib/Makefile +++ b/arch/ppc/syslib/Makefile | |||
@@ -96,7 +96,7 @@ ifeq ($(CONFIG_85xx),y) | |||
96 | obj-$(CONFIG_PCI) += pci_auto.o | 96 | obj-$(CONFIG_PCI) += pci_auto.o |
97 | endif | 97 | endif |
98 | obj-$(CONFIG_RAPIDIO) += ppc85xx_rio.o | 98 | obj-$(CONFIG_RAPIDIO) += ppc85xx_rio.o |
99 | obj-$(CONFIG_83xx) += ipic.o ppc83xx_setup.o ppc_sys.o \ | 99 | obj-$(CONFIG_83xx) += ppc83xx_setup.o ppc_sys.o \ |
100 | mpc83xx_sys.o mpc83xx_devices.o | 100 | mpc83xx_sys.o mpc83xx_devices.o |
101 | ifeq ($(CONFIG_83xx),y) | 101 | ifeq ($(CONFIG_83xx),y) |
102 | obj-$(CONFIG_PCI) += pci_auto.o | 102 | obj-$(CONFIG_PCI) += pci_auto.o |
diff --git a/include/asm-ppc/ipic.h b/include/asm-powerpc/ipic.h index 0fe396a2b666..0fe396a2b666 100644 --- a/include/asm-ppc/ipic.h +++ b/include/asm-powerpc/ipic.h | |||