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 'for-linus' of git://git.selinuxproject.org/~jmorris/linux-security
[pandora-kernel.git]
/
arch
/
arm
/
mach-mmp
/
Makefile
diff --git
a/arch/arm/mach-mmp/Makefile
b/arch/arm/mach-mmp/Makefile
index
b0ac942
..
8f948f9
100644
(file)
--- a/
arch/arm/mach-mmp/Makefile
+++ b/
arch/arm/mach-mmp/Makefile
@@
-19,4
+19,4
@@
obj-$(CONFIG_MACH_BROWNSTONE) += brownstone.o
obj-$(CONFIG_MACH_FLINT) += flint.o
obj-$(CONFIG_MACH_MARVELL_JASPER) += jasper.o
obj-$(CONFIG_MACH_TETON_BGA) += teton_bga.o
-obj-$(CONFIG_MACH_
SHEEVAD)
+= gplugd.o
+obj-$(CONFIG_MACH_
GPLUGD)
+= gplugd.o