diff --git a/[refs] b/[refs]
index dafb2f1cac9b..526de4ceb076 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3d1229d6ae92ed1994f4411b8493327ef8f4b76f
+refs/heads/master: 1cd8e506209223ed10da805d99be55e268f4023c
diff --git a/trunk/arch/powerpc/sysdev/Makefile b/trunk/arch/powerpc/sysdev/Makefile
index 6b7efcfc352a..b3e3636a57b0 100644
--- a/trunk/arch/powerpc/sysdev/Makefile
+++ b/trunk/arch/powerpc/sysdev/Makefile
@@ -6,3 +6,4 @@ obj-$(CONFIG_BOOKE)		+= dcr.o
 obj-$(CONFIG_40x)		+= dcr.o
 obj-$(CONFIG_U3_DART)		+= u3_iommu.o
 obj-$(CONFIG_MMIO_NVRAM)	+= mmio_nvram.o
+obj-$(CONFIG_83xx)		+= ipic.o
diff --git a/trunk/arch/ppc/syslib/ipic.c b/trunk/arch/powerpc/sysdev/ipic.c
similarity index 100%
rename from trunk/arch/ppc/syslib/ipic.c
rename to trunk/arch/powerpc/sysdev/ipic.c
diff --git a/trunk/arch/ppc/syslib/ipic.h b/trunk/arch/powerpc/sysdev/ipic.h
similarity index 100%
rename from trunk/arch/ppc/syslib/ipic.h
rename to trunk/arch/powerpc/sysdev/ipic.h
diff --git a/trunk/arch/ppc/syslib/Makefile b/trunk/arch/ppc/syslib/Makefile
index 5b7f2b80e56e..84ef03018d0e 100644
--- a/trunk/arch/ppc/syslib/Makefile
+++ b/trunk/arch/ppc/syslib/Makefile
@@ -96,7 +96,7 @@ ifeq ($(CONFIG_85xx),y)
 obj-$(CONFIG_PCI)		+= pci_auto.o
 endif
 obj-$(CONFIG_RAPIDIO)		+= ppc85xx_rio.o
-obj-$(CONFIG_83xx)		+= ipic.o ppc83xx_setup.o ppc_sys.o \
+obj-$(CONFIG_83xx)		+= ppc83xx_setup.o ppc_sys.o \
 					mpc83xx_sys.o mpc83xx_devices.o
 ifeq ($(CONFIG_83xx),y)
 obj-$(CONFIG_PCI)		+= pci_auto.o
diff --git a/trunk/include/asm-ppc/ipic.h b/trunk/include/asm-powerpc/ipic.h
similarity index 100%
rename from trunk/include/asm-ppc/ipic.h
rename to trunk/include/asm-powerpc/ipic.h