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/torvalds/linux-2.6 into sh/for...
[sfrench/cifs-2.6.git]
/
arch
/
arm
/
plat-s3c
/
Makefile
diff --git
a/arch/arm/plat-s3c/Makefile
b/arch/arm/plat-s3c/Makefile
index 3c09109e9e846689ae1d4d297078192d2647e370..50444da98425663d41527a84bfdb62371fd3e15a 100644
(file)
--- a/
arch/arm/plat-s3c/Makefile
+++ b/
arch/arm/plat-s3c/Makefile
@@
-36,6
+36,7
@@
obj-$(CONFIG_HAVE_PWM) += pwm.o
obj-$(CONFIG_S3C_DEV_HSMMC) += dev-hsmmc.o
obj-$(CONFIG_S3C_DEV_HSMMC1) += dev-hsmmc1.o
+obj-$(CONFIG_S3C_DEV_HSMMC2) += dev-hsmmc2.o
obj-y += dev-i2c0.o
obj-$(CONFIG_S3C_DEV_I2C1) += dev-i2c1.o
obj-$(CONFIG_S3C_DEV_FB) += dev-fb.o