projects
/
linux-2.6-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-linus/samsung4' of git://git.fluff.org/bjdooks/linux
[linux-2.6-block.git]
/
arch
/
arm
/
mach-s3c64xx
/
Makefile
diff --git
a/arch/arm/mach-s3c64xx/Makefile
b/arch/arm/mach-s3c64xx/Makefile
index 3758e15086bedf11abbee9ef854f10b4ae4721bd..a10f1fc6b023441b5b7dd3960d7c45906117b773 100644
(file)
--- a/
arch/arm/mach-s3c64xx/Makefile
+++ b/
arch/arm/mach-s3c64xx/Makefile
@@
-56,7
+56,6
@@
obj-$(CONFIG_MACH_HMT) += mach-hmt.o
# device support
obj-y += dev-uart.o
-obj-y += dev-rtc.o
obj-y += dev-audio.o
-obj-$(CONFIG_S3C_ADC) += dev-adc.o
obj-$(CONFIG_S3C64XX_DEV_SPI) += dev-spi.o
+obj-$(CONFIG_S3C64XX_DEV_TS) += dev-ts.o