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 master.kernel.org:/pub/scm/linux/kernel/git/davej/x86
[pandora-kernel.git]
/
arch
/
arm
/
common
/
Makefile
diff --git
a/arch/arm/common/Makefile
b/arch/arm/common/Makefile
index
ec8d17c
..
c81a2ff
100644
(file)
--- a/
arch/arm/common/Makefile
+++ b/
arch/arm/common/Makefile
@@
-4,6
+4,7
@@
obj-y += rtctime.o
obj-$(CONFIG_ARM_GIC) += gic.o
+obj-$(CONFIG_ARM_VIC) += vic.o
obj-$(CONFIG_ICST525) += icst525.o
obj-$(CONFIG_ICST307) += icst307.o
obj-$(CONFIG_SA1111) += sa1111.o