diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-02-09 09:44:28 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-02-09 09:44:28 -0800 |
| commit | 2fd592e45b9c89d69e126f172d0f991e2af955e5 (patch) | |
| tree | bacc34dbffb5da09b40840f409f7fad462e0acac /arch/mips/kernel/Makefile | |
| parent | 2affc857efdf7dacace234b63d289d67260c95a6 (diff) | |
| parent | 0a9b0db19262dbb09f3a34195e68cafd5dc3fa10 (diff) | |
| download | op-kernel-dev-2fd592e45b9c89d69e126f172d0f991e2af955e5.zip op-kernel-dev-2fd592e45b9c89d69e126f172d0f991e2af955e5.tar.gz | |
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/mips/kernel/Makefile')
| -rw-r--r-- | arch/mips/kernel/Makefile | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/mips/kernel/Makefile b/arch/mips/kernel/Makefile index bbbb8d7..1bf2c84 100644 --- a/arch/mips/kernel/Makefile +++ b/arch/mips/kernel/Makefile @@ -14,8 +14,6 @@ binfmt_irix-objs := irixelf.o irixinv.o irixioctl.o irixsig.o \ obj-$(CONFIG_STACKTRACE) += stacktrace.o obj-$(CONFIG_MODULES) += mips_ksyms.o module.o -obj-$(CONFIG_APM) += apm.o - obj-$(CONFIG_CPU_R3000) += r2300_fpu.o r2300_switch.o obj-$(CONFIG_CPU_TX39XX) += r2300_fpu.o r2300_switch.o obj-$(CONFIG_CPU_TX49XX) += r4k_fpu.o r4k_switch.o |
