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-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm...
[cascardo/linux.git]
/
arch
/
arm
/
mach-omap2
/
Makefile
diff --git
a/arch/arm/mach-omap2/Makefile
b/arch/arm/mach-omap2/Makefile
index
08cc944
..
5d27dfd
100644
(file)
--- a/
arch/arm/mach-omap2/Makefile
+++ b/
arch/arm/mach-omap2/Makefile
@@
-228,7
+228,6
@@
obj-$(CONFIG_SOC_OMAP5) += omap_hwmod_54xx_data.o
obj-$(CONFIG_SOC_DRA7XX) += omap_hwmod_7xx_data.o
# EMU peripherals
-obj-$(CONFIG_OMAP3_EMU) += emu.o
obj-$(CONFIG_HW_PERF_EVENTS) += pmu.o
iommu-$(CONFIG_OMAP_IOMMU) := omap-iommu.o