aboutsummaryrefslogtreecommitdiffstats
path: root/arch/ppc64/kernel/Makefile
diff options
context:
space:
mode:
authorPaul Mackerras <paulus@samba.org>2005-10-20 09:23:26 +1000
committerPaul Mackerras <paulus@samba.org>2005-10-20 09:23:26 +1000
commitf2783c15007468c14972e2617db51e9affc7fad9 (patch)
tree6c8f57ee8e5cdaeb810a3ccf7f697576a7df7615 /arch/ppc64/kernel/Makefile
parentppc64: Minor compilation fixes (diff)
downloadlinux-dev-f2783c15007468c14972e2617db51e9affc7fad9.tar.xz
linux-dev-f2783c15007468c14972e2617db51e9affc7fad9.zip
powerpc: Merge time.c and asm/time.h.
We now use the merged time.c for both 32-bit and 64-bit compilation with ARCH=powerpc, and for ARCH=ppc64, but not for ARCH=ppc32. This removes setup_default_decr (folds its function into time_init) and moves wakeup_decrementer into time.c. This also makes an asm-powerpc/rtc.h. Signed-off-by: Paul Mackerras <paulus@samba.org>
Diffstat (limited to 'arch/ppc64/kernel/Makefile')
-rw-r--r--arch/ppc64/kernel/Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/ppc64/kernel/Makefile b/arch/ppc64/kernel/Makefile
index 8c9012f0ce6a..18f477fa1df2 100644
--- a/arch/ppc64/kernel/Makefile
+++ b/arch/ppc64/kernel/Makefile
@@ -12,7 +12,7 @@ obj-y := setup.o entry.o misc.o prom.o
endif
obj-y += irq.o idle.o dma.o \
- time.o signal.o \
+ signal.o \
align.o bitops.o pacaData.o \
udbg.o ioctl32.o \
rtc.o \