diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2009-09-12 07:02:26 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-09-12 07:02:26 -0400 |
| commit | ddd559b13f6d2fe3ad68c4b3f5235fd3c2eae4e3 (patch) | |
| tree | d827bca3fc825a0ac33efbcd493713be40fcc812 /arch/arm/mach-s3c6410/Kconfig | |
| parent | cf7a2b4fb6a9b86779930a0a123b0df41aa9208f (diff) | |
| parent | f17a1f06d2fa93f4825be572622eb02c4894db4e (diff) | |
Merge branch 'devel-stable' into devel
Conflicts:
MAINTAINERS
arch/arm/mm/fault.c
Diffstat (limited to 'arch/arm/mach-s3c6410/Kconfig')
| -rw-r--r-- | arch/arm/mach-s3c6410/Kconfig | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/arch/arm/mach-s3c6410/Kconfig b/arch/arm/mach-s3c6410/Kconfig index e63aac7f4e5a..f9d0f09f9761 100644 --- a/arch/arm/mach-s3c6410/Kconfig +++ b/arch/arm/mach-s3c6410/Kconfig | |||
| @@ -97,3 +97,13 @@ config MACH_NCP | |||
| 97 | select S3C64XX_SETUP_I2C1 | 97 | select S3C64XX_SETUP_I2C1 |
| 98 | help | 98 | help |
| 99 | Machine support for the Samsung NCP | 99 | Machine support for the Samsung NCP |
| 100 | |||
| 101 | config MACH_HMT | ||
| 102 | bool "Airgoo HMT" | ||
| 103 | select CPU_S3C6410 | ||
| 104 | select S3C_DEV_FB | ||
| 105 | select S3C_DEV_USB_HOST | ||
| 106 | select S3C64XX_SETUP_FB_24BPP | ||
| 107 | select HAVE_PWM | ||
| 108 | help | ||
| 109 | Machine support for the Airgoo HMT | ||