diff options
| author | David S. Miller <davem@davemloft.net> | 2008-03-18 02:44:31 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-03-18 02:44:31 -0400 |
| commit | 2f633928cbba8a5858bb39b11e7219a41b0fbef5 (patch) | |
| tree | 9a82f4b7f2c3afe4b0208d8e44ea61bae90a7d22 /arch/mips/kernel/Makefile | |
| parent | 5e226e4d9016daee170699f8a4188a5505021756 (diff) | |
| parent | bde4f8fa8db2abd5ac9c542d76012d0fedab050f (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'arch/mips/kernel/Makefile')
| -rw-r--r-- | arch/mips/kernel/Makefile | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/mips/kernel/Makefile b/arch/mips/kernel/Makefile index ffa08362de17..9e78e1a4ca17 100644 --- a/arch/mips/kernel/Makefile +++ b/arch/mips/kernel/Makefile | |||
| @@ -76,7 +76,6 @@ obj-$(CONFIG_PROC_FS) += proc.o | |||
| 76 | obj-$(CONFIG_64BIT) += cpu-bugs64.o | 76 | obj-$(CONFIG_64BIT) += cpu-bugs64.o |
| 77 | 77 | ||
| 78 | obj-$(CONFIG_I8253) += i8253.o | 78 | obj-$(CONFIG_I8253) += i8253.o |
| 79 | obj-$(CONFIG_PCSPEAKER) += pcspeaker.o | ||
| 80 | 79 | ||
| 81 | obj-$(CONFIG_KEXEC) += machine_kexec.o relocate_kernel.o | 80 | obj-$(CONFIG_KEXEC) += machine_kexec.o relocate_kernel.o |
| 82 | obj-$(CONFIG_EARLY_PRINTK) += early_printk.o | 81 | obj-$(CONFIG_EARLY_PRINTK) += early_printk.o |