diff options
| author | Igor Mammedov <niallain@gmail.com> | 2008-04-28 19:08:21 -0400 |
|---|---|---|
| committer | Steve French <sfrench@us.ibm.com> | 2008-04-28 19:08:21 -0400 |
| commit | e9f20d6f03e8df393b001dab6dc5226c2a5daf57 (patch) | |
| tree | 73e94fa5e4f83576c97e36187b809c5aad2ade30 /arch/mips/mips-boards/generic/Makefile | |
| parent | bf62fd887cab230f5952b611bde25e8e15acb454 (diff) | |
| parent | e31a94ed371c70855eb30b77c490d6d85dd4da26 (diff) | |
Merge branch 'master' of /pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'arch/mips/mips-boards/generic/Makefile')
| -rw-r--r-- | arch/mips/mips-boards/generic/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/mips/mips-boards/generic/Makefile b/arch/mips/mips-boards/generic/Makefile index b31d8dfed1be..f7f87fc09d1e 100644 --- a/arch/mips/mips-boards/generic/Makefile +++ b/arch/mips/mips-boards/generic/Makefile | |||
| @@ -20,6 +20,7 @@ | |||
| 20 | 20 | ||
| 21 | obj-y := reset.o display.o init.o memory.o \ | 21 | obj-y := reset.o display.o init.o memory.o \ |
| 22 | cmdline.o time.o | 22 | cmdline.o time.o |
| 23 | obj-y += amon.o | ||
| 23 | 24 | ||
| 24 | obj-$(CONFIG_EARLY_PRINTK) += console.o | 25 | obj-$(CONFIG_EARLY_PRINTK) += console.o |
| 25 | obj-$(CONFIG_PCI) += pci.o | 26 | obj-$(CONFIG_PCI) += pci.o |