14 files changed, 6 insertions, 7 deletions

diff --git a/arch/powerpc/platforms/powermac/Makefile b/arch/powerpc/platforms/powermac/Makefile
index 37b7341396e4..74712ede16df 100644
--- a/arch/powerpc/platforms/powermac/Makefile
+++ b/arch/powerpc/platforms/powermac/Makefile
@@ -1,9 +1,8 @@
-obj-$(CONFIG_PPC_PMAC)          += pmac_pic.o pmac_setup.o pmac_time.o \
-                                   pmac_feature.o pmac_pci.o pmac_sleep.o \
-                                   pmac_low_i2c.o pmac_cache.o
-obj-$(CONFIG_PMAC_BACKLIGHT)    += pmac_backlight.o
-obj-$(CONFIG_CPU_FREQ_PMAC)     += pmac_cpufreq.o
+obj-$(CONFIG_PPC_PMAC)          += pic.o setup.o time.o feature.o pci.o \
+                                   sleep.o low_i2c.o cache.o
+obj-$(CONFIG_PMAC_BACKLIGHT)    += backlight.o
+obj-$(CONFIG_CPU_FREQ_PMAC)     += cpufreq.o
 ifeq ($(CONFIG_PPC_PMAC),y)
-obj-$(CONFIG_NVRAM)             += pmac_nvram.o
-obj-$(CONFIG_SMP)               += pmac_smp.o
+obj-$(CONFIG_NVRAM)             += nvram.o
+obj-$(CONFIG_SMP)               += smp.o
 endif
diff --git a/arch/powerpc/platforms/powermac/pmac_backlight.c b/arch/powerpc/platforms/powermac/backlight.c
index 8be2f7d071f0..8be2f7d071f0 100644
--- a/arch/powerpc/platforms/powermac/pmac_backlight.c
+++ b/arch/powerpc/platforms/powermac/backlight.c
diff --git a/arch/powerpc/platforms/powermac/pmac_cache.S b/arch/powerpc/platforms/powermac/cache.S
index fb977de6b704..fb977de6b704 100644
--- a/arch/powerpc/platforms/powermac/pmac_cache.S
+++ b/arch/powerpc/platforms/powermac/cache.S
diff --git a/arch/powerpc/platforms/powermac/pmac_cpufreq.c b/arch/powerpc/platforms/powermac/cpufreq.c
index 6d32d99402be..6d32d99402be 100644
--- a/arch/powerpc/platforms/powermac/pmac_cpufreq.c
+++ b/arch/powerpc/platforms/powermac/cpufreq.c
diff --git a/arch/powerpc/platforms/powermac/pmac_feature.c b/arch/powerpc/platforms/powermac/feature.c
index 2cba670c71b7..2cba670c71b7 100644
--- a/arch/powerpc/platforms/powermac/pmac_feature.c
+++ b/arch/powerpc/platforms/powermac/feature.c
diff --git a/arch/powerpc/platforms/powermac/pmac_low_i2c.c b/arch/powerpc/platforms/powermac/low_i2c.c
index f3f39e8e337a..f3f39e8e337a 100644
--- a/arch/powerpc/platforms/powermac/pmac_low_i2c.c
+++ b/arch/powerpc/platforms/powermac/low_i2c.c
diff --git a/arch/powerpc/platforms/powermac/pmac_nvram.c b/arch/powerpc/platforms/powermac/nvram.c
index 8c9b008c7226..8c9b008c7226 100644
--- a/arch/powerpc/platforms/powermac/pmac_nvram.c
+++ b/arch/powerpc/platforms/powermac/nvram.c
diff --git a/arch/powerpc/platforms/powermac/pmac_pci.c b/arch/powerpc/platforms/powermac/pci.c
index 40bcd3e55afb..40bcd3e55afb 100644
--- a/arch/powerpc/platforms/powermac/pmac_pci.c
+++ b/arch/powerpc/platforms/powermac/pci.c
diff --git a/arch/powerpc/platforms/powermac/pmac_pic.c b/arch/powerpc/platforms/powermac/pic.c
index 7ddd5264cc6e..7ddd5264cc6e 100644
--- a/arch/powerpc/platforms/powermac/pmac_pic.c
+++ b/arch/powerpc/platforms/powermac/pic.c
diff --git a/arch/powerpc/platforms/powermac/pmac_pic.h b/arch/powerpc/platforms/powermac/pic.h
index 664103dfeef9..664103dfeef9 100644
--- a/arch/powerpc/platforms/powermac/pmac_pic.h
+++ b/arch/powerpc/platforms/powermac/pic.h
diff --git a/arch/powerpc/platforms/powermac/pmac_setup.c b/arch/powerpc/platforms/powermac/setup.c
index 1b12bf9956cb..1b12bf9956cb 100644
--- a/arch/powerpc/platforms/powermac/pmac_setup.c
+++ b/arch/powerpc/platforms/powermac/setup.c
diff --git a/arch/powerpc/platforms/powermac/pmac_sleep.S b/arch/powerpc/platforms/powermac/sleep.S
index 88419c77ac43..88419c77ac43 100644
--- a/arch/powerpc/platforms/powermac/pmac_sleep.S
+++ b/arch/powerpc/platforms/powermac/sleep.S
diff --git a/arch/powerpc/platforms/powermac/pmac_smp.c b/arch/powerpc/platforms/powermac/smp.c
index fb996336c58b..fb996336c58b 100644
--- a/arch/powerpc/platforms/powermac/pmac_smp.c
+++ b/arch/powerpc/platforms/powermac/smp.c
diff --git a/arch/powerpc/platforms/powermac/pmac_time.c b/arch/powerpc/platforms/powermac/time.c
index ff6adff36cb8..ff6adff36cb8 100644
--- a/arch/powerpc/platforms/powermac/pmac_time.c
+++ b/arch/powerpc/platforms/powermac/time.c