Merge git://oak/home/sfr/kernels/iseries/work

[linux-2.6.git] / arch / ppc64 / kernel / Makefile

diff --git a/arch/ppc64/kernel/Makefile b/arch/ppc64/kernel/Makefile
index 13e479846249aac4267771037e0f5948f6ff430f..1f71f23cc26d230b79787775a2720c71ce114db4 100644 (file)
--- a/arch/ppc64/kernel/Makefile
+++ b/arch/ppc64/kernel/Makefile
@@ -12,11 +12,10 @@ obj-y               :=      misc.o prom.o
 endif
 
 obj-y               += idle.o dma.o \
-                       align.o pacaData.o \
-                       udbg.o ioctl32.o \
+                       align.o \
+                       udbg.o \
                        rtc.o \
-                       cpu_setup_power4.o \
-                       iommu.o sysfs.o vdso.o firmware.o
+                       iommu.o sysfs.o vdso.o
 obj-y += vdso32/ vdso64/
 
 pci-obj-$(CONFIG_PPC_MULTIPLATFORM)    += pci_dn.o pci_direct_iommu.o
@@ -31,7 +30,6 @@ endif
 obj-$(CONFIG_PPC_PSERIES) += udbg_16550.o
 
 obj-$(CONFIG_KEXEC)            += machine_kexec.o
-obj-$(CONFIG_EEH)              += eeh.o
 obj-$(CONFIG_PROC_FS)          += proc_ppc64.o
 obj-$(CONFIG_MODULES)          += module.o
 ifneq ($(CONFIG_PPC_MERGE),y)
@@ -52,8 +50,6 @@ obj-$(CONFIG_PPC_MAPLE)               += udbg_16550.o
 
 obj-$(CONFIG_KPROBES)          += kprobes.o
 
-CFLAGS_ioctl32.o += -Ifs/
-
 ifneq ($(CONFIG_PPC_MERGE),y)
 ifeq ($(CONFIG_PPC_ISERIES),y)
 arch/ppc64/kernel/head.o: arch/powerpc/kernel/lparmap.s