projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu
[cascardo/linux.git]
/
arch
/
m68k
/
kernel
/
Makefile
diff --git
a/arch/m68k/kernel/Makefile
b/arch/m68k/kernel/Makefile
index
e47778f
..
8a1c4d3
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