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 'omap-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind...
[linux-2.6-block.git]
/
arch
/
arm
/
mach-omap2
/
Makefile
diff --git
a/arch/arm/mach-omap2/Makefile
b/arch/arm/mach-omap2/Makefile
index 59b0ccce30992a54f73619a5675333c75a55fa29..32548a4510c51b89e3fc3637fcf306dcc712a77d 100644
(file)
--- a/
arch/arm/mach-omap2/Makefile
+++ b/
arch/arm/mach-omap2/Makefile
@@
-44,6
+44,9
@@
obj-$(CONFIG_ARCH_OMAP4) += cm4xxx.o
obj-$(CONFIG_ARCH_OMAP2) += clock24xx.o
obj-$(CONFIG_ARCH_OMAP3) += clock34xx.o
+# EMU peripherals
+obj-$(CONFIG_OMAP3_EMU) += emu.o
+
obj-$(CONFIG_OMAP_MBOX_FWK) += mailbox_mach.o
mailbox_mach-objs := mailbox.o