Merge master.kernel.org:/pub/scm/linux/kernel/git/paulus/powerpc

[linux-2.6-omap-h63xx.git] / arch / powerpc / platforms / powermac / Makefile

diff --git a/arch/powerpc/platforms/powermac/Makefile b/arch/powerpc/platforms/powermac/Makefile
index 4369676f1d541d416665a4e1d165150ed7566f78..78093d7f97af9af6ca4bed23814f8809b4ffb1aa 100644 (file)
--- a/arch/powerpc/platforms/powermac/Makefile
+++ b/arch/powerpc/platforms/powermac/Makefile
@@ -1,8 +1,14 @@
+CFLAGS_bootx_init.o            += -fPIC
+
 obj-y                          += pic.o setup.o time.o feature.o pci.o \
-                                  sleep.o low_i2c.o cache.o
+                                  sleep.o low_i2c.o cache.o pfunc_core.o \
+                                  pfunc_base.o
 obj-$(CONFIG_PMAC_BACKLIGHT)   += backlight.o
-obj-$(CONFIG_CPU_FREQ_PMAC)    += cpufreq.o
+obj-$(CONFIG_CPU_FREQ_PMAC)    += cpufreq_32.o
+obj-$(CONFIG_CPU_FREQ_PMAC64)  += cpufreq_64.o
 obj-$(CONFIG_NVRAM)            += nvram.o
 # ppc64 pmac doesn't define CONFIG_NVRAM but needs nvram stuff
 obj-$(CONFIG_PPC64)            += nvram.o
+obj-$(CONFIG_PPC32)            += bootx_init.o
 obj-$(CONFIG_SMP)              += smp.o
+obj-$(CONFIG_PPC_MERGE)                += udbg_scc.o udbg_adb.o