diff options
| author | Ben Dooks <ben-linux@fluff.org> | 2010-05-20 18:51:59 +0900 |
|---|---|---|
| committer | Ben Dooks <ben-linux@fluff.org> | 2010-05-20 18:51:59 +0900 |
| commit | fac3d3555568de1755025a9609daf492dd548a59 (patch) | |
| tree | 694d468070c32d9a01223ef76c2610ec3f5d4ff7 /arch/arm/mach-s3c64xx/Kconfig | |
| parent | d48562abe29ceee66a6aad7b565b021ddd7f598a (diff) | |
| parent | 41d8289d161e23e9cff78c914b6f37f30e627ea2 (diff) | |
| download | talos-op-linux-fac3d3555568de1755025a9609daf492dd548a59.tar.gz talos-op-linux-fac3d3555568de1755025a9609daf492dd548a59.zip | |
ARM: Merge for-2635-4/ts-machines
Merge branch 'for-2635-4/ts-machines' into for-2635-4/partial1
Diffstat (limited to 'arch/arm/mach-s3c64xx/Kconfig')
| -rw-r--r-- | arch/arm/mach-s3c64xx/Kconfig | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/mach-s3c64xx/Kconfig b/arch/arm/mach-s3c64xx/Kconfig index 69e9fbfea917..1f2f412b0200 100644 --- a/arch/arm/mach-s3c64xx/Kconfig +++ b/arch/arm/mach-s3c64xx/Kconfig @@ -90,6 +90,7 @@ config MACH_SMDK6410 select S3C_DEV_HSMMC1 select S3C_DEV_I2C1 select S3C_DEV_FB + select SAMSUNG_DEV_TS select S3C_DEV_USB_HOST select S3C_DEV_USB_HSOTG select S3C64XX_SETUP_SDHCI |
