diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-10 11:28:32 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-10 11:28:32 -0500 |
| commit | a62e68488dd5ddb07776555fd7e0435c6d021ac1 (patch) | |
| tree | d6cec15baa1ddfee108ef77b315dfdea5e3fa71c /arch/powerpc/kernel/Makefile | |
| parent | ab396e91bfe953db26fa1083d9c3e7a4fbe0334a (diff) | |
| parent | 3b212db9217d02e623eaa12f41c9b5f8c6a99535 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc-merge
Diffstat (limited to 'arch/powerpc/kernel/Makefile')
| -rw-r--r-- | arch/powerpc/kernel/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/kernel/Makefile b/arch/powerpc/kernel/Makefile index 17ed5018288b..144e284d21dd 100644 --- a/arch/powerpc/kernel/Makefile +++ b/arch/powerpc/kernel/Makefile | |||
| @@ -54,7 +54,7 @@ obj-$(CONFIG_BOOTX_TEXT) += btext.o | |||
| 54 | obj-$(CONFIG_6xx) += idle_6xx.o | 54 | obj-$(CONFIG_6xx) += idle_6xx.o |
| 55 | obj-$(CONFIG_SMP) += smp.o | 55 | obj-$(CONFIG_SMP) += smp.o |
| 56 | obj-$(CONFIG_KPROBES) += kprobes.o | 56 | obj-$(CONFIG_KPROBES) += kprobes.o |
| 57 | obj-$(CONFIG_SERIAL_8250) += legacy_serial.o udbg_16550.o | 57 | obj-$(CONFIG_PPC_UDBG_16550) += legacy_serial.o udbg_16550.o |
| 58 | module-$(CONFIG_PPC64) += module_64.o | 58 | module-$(CONFIG_PPC64) += module_64.o |
| 59 | obj-$(CONFIG_MODULES) += $(module-y) | 59 | obj-$(CONFIG_MODULES) += $(module-y) |
| 60 | 60 | ||