diff options
author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-10 17:28:32 +0100 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-10 17:28:32 +0100 |
commit | a62e68488dd5ddb07776555fd7e0435c6d021ac1 (patch) | |
tree | d6cec15baa1ddfee108ef77b315dfdea5e3fa71c /arch/powerpc/kernel/Makefile | |
parent | Merge ssh://master.kernel.org/pub/scm/linux/kernel/git/sam/kbuild (diff) | |
parent | [PATCH] powerpc: Some ppc compile fixes... (diff) | |
download | linux-a62e68488dd5ddb07776555fd7e0435c6d021ac1.tar.xz linux-a62e68488dd5ddb07776555fd7e0435c6d021ac1.zip |
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 obj-$(CONFIG_6xx) += idle_6xx.o obj-$(CONFIG_SMP) += smp.o obj-$(CONFIG_KPROBES) += kprobes.o -obj-$(CONFIG_SERIAL_8250) += legacy_serial.o udbg_16550.o +obj-$(CONFIG_PPC_UDBG_16550) += legacy_serial.o udbg_16550.o module-$(CONFIG_PPC64) += module_64.o obj-$(CONFIG_MODULES) += $(module-y) |