From: Paul Mackerras <paulus@samba.org>
Date: Thu, 10 Nov 2005 02:08:55 +0000 (+1100)
Subject: Merge git://oak/home/sfr/kernels/iseries/work
X-Git-Tag: v2.6.15-rc1~51^2~20
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=e130bedb7ce718a8eb6b56a3806b96281f618111;p=linux-2.6-omap-h63xx.git

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

e130bedb7ce718a8eb6b56a3806b96281f618111
diff --cc arch/powerpc/kernel/Makefile
index 103cb8128ef,cbdc1426165..92cfabf929b
--- a/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/ppc64/kernel/Makefile
index 7548968b799,13e47984624..1f71f23cc26
--- a/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