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

diff --cc arch/powerpc/kernel/Makefile
index 103cb8128ef4e9ed33f51ca0293c3cd0014fe576,cbdc14261655e9f7098c68cbc0d7edd6a0e7e311..92cfabf929bc73ac2a01192363b6631a2f8458d0
--- 1/arch/powerpc/kernel/Makefile
--- 2/arch/powerpc/kernel/Makefile
+++ b/arch/powerpc/kernel/Makefile
@@@ -12,11 -11,9 +12,11 @@@ CFLAGS_btext.o              += -fPI
  endif
  
  obj-y                         := semaphore.o cputable.o ptrace.o syscalls.o \
-                                  signal_32.o pmc.o
+                                  irq.o signal_32.o pmc.o
  obj-$(CONFIG_PPC64)           += setup_64.o binfmt_elf32.o sys_ppc32.o \
 -                                 signal_64.o ptrace32.o systbl.o
 +                                 signal_64.o ptrace32.o systbl.o \
 +                                 paca.o ioctl32.o cpu_setup_power4.o \
 +                                 firmware.o
  obj-$(CONFIG_ALTIVEC)         += vecemu.o vector.o
  obj-$(CONFIG_POWER4)          += idle_power4.o
  obj-$(CONFIG_PPC_OF)          += of_device.o

diff --cc arch/ppc/kernel/ppc_ksyms.c
Simple merge

diff --cc arch/ppc64/kernel/Makefile
index 7548968b7997c5db13f8236b93fe1c0d5f77f0e3,13e479846249aac4267771037e0f5948f6ff430f..1f71f23cc26d230b79787775a2720c71ce114db4
--- 1/arch/ppc64/kernel/Makefile
--- 2/arch/ppc64/kernel/Makefile
+++ b/arch/ppc64/kernel/Makefile
@@@ -11,11 -11,12 +11,11 @@@ obj-y               :=     misc.o prom.
  
  endif
  
- obj-y               +=        irq.o idle.o dma.o \
+ 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