git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'next-samsung-board-v3.1' into next-samsung-board
[pandora-kernel.git]
/
arch
/
arm
/
mach-exynos4
/
Makefile
diff --git
a/arch/arm/mach-exynos4/Makefile
b/arch/arm/mach-exynos4/Makefile
index
64ffad4
..
e19cd12
100644
(file)
--- a/
arch/arm/mach-exynos4/Makefile
+++ b/
arch/arm/mach-exynos4/Makefile
@@
-32,6
+32,7
@@
obj-$(CONFIG_MACH_SMDKV310) += mach-smdkv310.o
obj-$(CONFIG_MACH_ARMLEX4210) += mach-armlex4210.o
obj-$(CONFIG_MACH_UNIVERSAL_C210) += mach-universal_c210.o
obj-$(CONFIG_MACH_NURI) += mach-nuri.o
+obj-$(CONFIG_MACH_ORIGEN) += mach-origen.o
obj-$(CONFIG_MACH_SMDK4212) += mach-smdk4212.o