diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-02-09 18:44:28 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-02-09 18:44:28 +0100 |
| commit | 2fd592e45b9c89d69e126f172d0f991e2af955e5 (patch) | |
| tree | bacc34dbffb5da09b40840f409f7fad462e0acac /arch/sh/kernel/Makefile | |
| parent | [PATCH] SH vdso: use install_special_mapping() (diff) | |
| parent | [APM] SH: Convert to use shared APM emulation. (diff) | |
| download | linux-2fd592e45b9c89d69e126f172d0f991e2af955e5.tar.xz linux-2fd592e45b9c89d69e126f172d0f991e2af955e5.zip | |
Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-apm
* 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-apm:
[APM] SH: Convert to use shared APM emulation.
[APM] MIPS: Convert to use shared APM emulation.
[APM] ARM: Convert to use shared APM emulation.
[APM] Add shared version of APM emulation
Diffstat (limited to 'arch/sh/kernel/Makefile')
| -rw-r--r-- | arch/sh/kernel/Makefile | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/sh/kernel/Makefile b/arch/sh/kernel/Makefile index 99c7e5249f7a..2f6d2bcb1c93 100644 --- a/arch/sh/kernel/Makefile +++ b/arch/sh/kernel/Makefile @@ -19,6 +19,5 @@ obj-$(CONFIG_SH_CPU_FREQ) += cpufreq.o obj-$(CONFIG_MODULES) += module.o obj-$(CONFIG_EARLY_PRINTK) += early_printk.o obj-$(CONFIG_KEXEC) += machine_kexec.o relocate_kernel.o -obj-$(CONFIG_APM) += apm.o obj-$(CONFIG_PM) += pm.o obj-$(CONFIG_STACKTRACE) += stacktrace.o |