projects
/
linux-2.6-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'kbuild' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild
[linux-2.6-block.git]
/
arch
/
m68k
/
kernel
/
Makefile
diff --git
a/arch/m68k/kernel/Makefile
b/arch/m68k/kernel/Makefile
index 3600500beab503bb7ae92aef5843be0f2e95e1df..74c898ced8cc0481e3fa70dc0b7e6d8b86d1994f 100644
(file)
--- a/
arch/m68k/kernel/Makefile
+++ b/
arch/m68k/kernel/Makefile
@@
-24,6
+24,7
@@
obj-$(CONFIG_HAS_DMA) += dma.o
obj-$(CONFIG_KEXEC) += machine_kexec.o relocate_kernel.o
obj-$(CONFIG_BOOTINFO_PROC) += bootinfo_proc.o
+obj-$(CONFIG_UBOOT) += uboot.o
obj-$(CONFIG_EARLY_PRINTK) += early_printk.o