diff options
author | Paul Mackerras <paulus@samba.org> | 2006-03-26 23:03:03 -0500 |
---|---|---|
committer | Paul Mackerras <paulus@samba.org> | 2006-03-26 23:03:03 -0500 |
commit | a0652fc9a28c3ef8cd59264bfcb089c44d1b0e06 (patch) | |
tree | a28527b65237b3067553a993f5ad06dfb24df044 /arch/ppc/kernel/Makefile | |
parent | 55aab8cd3a498201b769a19de861c77516bdfd45 (diff) |
powerpc: Unify the 32 and 64 bit idle loops
This unifies the 32-bit (ARCH=ppc and ARCH=powerpc) and 64-bit idle
loops. It brings over the concept of having a ppc_md.power_save
function from 32-bit to ARCH=powerpc, which lets us get rid of
native_idle(). With this we will also be able to simplify the idle
handling for pSeries and cell.
Signed-off-by: Paul Mackerras <paulus@samba.org>
Diffstat (limited to 'arch/ppc/kernel/Makefile')
-rw-r--r-- | arch/ppc/kernel/Makefile | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/arch/ppc/kernel/Makefile b/arch/ppc/kernel/Makefile index e399bbb969a4..1b2c7458a3d0 100644 --- a/arch/ppc/kernel/Makefile +++ b/arch/ppc/kernel/Makefile | |||
@@ -8,10 +8,9 @@ extra-$(CONFIG_40x) := head_4xx.o | |||
8 | extra-$(CONFIG_44x) := head_44x.o | 8 | extra-$(CONFIG_44x) := head_44x.o |
9 | extra-$(CONFIG_FSL_BOOKE) := head_fsl_booke.o | 9 | extra-$(CONFIG_FSL_BOOKE) := head_fsl_booke.o |
10 | extra-$(CONFIG_8xx) := head_8xx.o | 10 | extra-$(CONFIG_8xx) := head_8xx.o |
11 | extra-$(CONFIG_6xx) += idle_6xx.o | ||
12 | extra-y += vmlinux.lds | 11 | extra-y += vmlinux.lds |
13 | 12 | ||
14 | obj-y := entry.o traps.o idle.o time.o misc.o \ | 13 | obj-y := entry.o traps.o time.o misc.o \ |
15 | setup.o \ | 14 | setup.o \ |
16 | ppc_htab.o | 15 | ppc_htab.o |
17 | obj-$(CONFIG_6xx) += l2cr.o cpu_setup_6xx.o | 16 | obj-$(CONFIG_6xx) += l2cr.o cpu_setup_6xx.o |
@@ -35,7 +34,6 @@ endif | |||
35 | # These are here while we do the architecture merge | 34 | # These are here while we do the architecture merge |
36 | 35 | ||
37 | else | 36 | else |
38 | obj-y := idle.o | ||
39 | obj-$(CONFIG_6xx) += l2cr.o cpu_setup_6xx.o | 37 | obj-$(CONFIG_6xx) += l2cr.o cpu_setup_6xx.o |
40 | obj-$(CONFIG_SOFTWARE_SUSPEND) += swsusp.o | 38 | obj-$(CONFIG_SOFTWARE_SUSPEND) += swsusp.o |
41 | obj-$(CONFIG_MODULES) += module.o | 39 | obj-$(CONFIG_MODULES) += module.o |