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 git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
[pandora-kernel.git]
/
arch
/
arm
/
mach-ks8695
/
Makefile
diff --git
a/arch/arm/mach-ks8695/Makefile
b/arch/arm/mach-ks8695/Makefile
index
f735d2c
..
7e3e816
100644
(file)
--- a/
arch/arm/mach-ks8695/Makefile
+++ b/
arch/arm/mach-ks8695/Makefile
@@
-17,3
+17,4
@@
obj-$(CONFIG_LEDS) += leds.o
# Board-specific support
obj-$(CONFIG_MACH_KS8695) += board-micrel.o
obj-$(CONFIG_MACH_DSM320) += board-dsm320.o
+obj-$(CONFIG_MACH_ACS5K) += board-acs5k.o