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 'master' into for-2.6.35
[pandora-kernel.git]
/
arch
/
arm
/
common
/
Makefile
diff --git
a/arch/arm/common/Makefile
b/arch/arm/common/Makefile
index
76be7ff
..
e6e8664
100644
(file)
--- a/
arch/arm/common/Makefile
+++ b/
arch/arm/common/Makefile
@@
-4,8
+4,8
@@
obj-$(CONFIG_ARM_GIC) += gic.o
obj-$(CONFIG_ARM_VIC) += vic.o
obj-$(CONFIG_ARM_GIC) += gic.o
obj-$(CONFIG_ARM_VIC) += vic.o
-obj-$(CONFIG_ICST
525) += icst525
.o
-obj-$(CONFIG_
ICST307) += icst307
.o
+obj-$(CONFIG_ICST
) += icst
.o
+obj-$(CONFIG_
PL330) += pl330
.o
obj-$(CONFIG_SA1111) += sa1111.o
obj-$(CONFIG_PCI_HOST_VIA82C505) += via82c505.o
obj-$(CONFIG_DMABOUNCE) += dmabounce.o
obj-$(CONFIG_SA1111) += sa1111.o
obj-$(CONFIG_PCI_HOST_VIA82C505) += via82c505.o
obj-$(CONFIG_DMABOUNCE) += dmabounce.o