git.samba.org
/
sfrench
/
cifs-2.6.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/hirofumi/fatfs-2.6
[sfrench/cifs-2.6.git]
/
arch
/
arm
/
mach-s3c2440
/
Makefile
diff --git
a/arch/arm/mach-s3c2440/Makefile
b/arch/arm/mach-s3c2440/Makefile
index bfadcf684a2a66f2448595a0d30458f19643e8e9..5f32245318856ed51d808023e9398f1b5b4224a0 100644
(file)
--- a/
arch/arm/mach-s3c2440/Makefile
+++ b/
arch/arm/mach-s3c2440/Makefile
@@
-23,3
+23,7
@@
obj-$(CONFIG_ARCH_S3C2440) += mach-smdk2440.o
obj-$(CONFIG_MACH_NEXCODER_2440) += mach-nexcoder.o
obj-$(CONFIG_MACH_AT2440EVB) += mach-at2440evb.o
obj-$(CONFIG_MACH_MINI2440) += mach-mini2440.o
+
+# extra machine support
+
+obj-$(CONFIG_MACH_OSIRIS_DVS) += mach-osiris-dvs.o