diff options
| author | Kukjin Kim <kgene.kim@samsung.com> | 2011-01-06 04:44:09 -0500 |
|---|---|---|
| committer | Kukjin Kim <kgene.kim@samsung.com> | 2011-01-06 04:44:09 -0500 |
| commit | 854bf596b3be4f4b41c5b3bd8039e4828ec1ace6 (patch) | |
| tree | 27b967178723f0230043dc0b0d1436d2eb81a29d /arch/arm/plat-samsung/Kconfig | |
| parent | ab10f1dd914ad87e0370bd8b82f77dcd32b6d941 (diff) | |
| parent | 13d27f05d7b2c41d59c6e4bd6fc4ea10d3302ec3 (diff) | |
Merge branch 'next-s3c24xx' into for-next
Diffstat (limited to 'arch/arm/plat-samsung/Kconfig')
| -rw-r--r-- | arch/arm/plat-samsung/Kconfig | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/arch/arm/plat-samsung/Kconfig b/arch/arm/plat-samsung/Kconfig index 2ebf4157d93a..32be05cf82a3 100644 --- a/arch/arm/plat-samsung/Kconfig +++ b/arch/arm/plat-samsung/Kconfig | |||
| @@ -95,6 +95,12 @@ config S3C_GPIO_PULL_UPDOWN | |||
| 95 | help | 95 | help |
| 96 | Internal configuration to enable the correct GPIO pull helper | 96 | Internal configuration to enable the correct GPIO pull helper |
| 97 | 97 | ||
| 98 | config S3C_GPIO_PULL_S3C2443 | ||
| 99 | bool | ||
| 100 | select S3C_GPIO_PULL_UPDOWN | ||
| 101 | help | ||
| 102 | Internal configuration to enable the correct GPIO pull helper for S3C2443-style GPIO | ||
| 103 | |||
| 98 | config S3C_GPIO_PULL_DOWN | 104 | config S3C_GPIO_PULL_DOWN |
| 99 | bool | 105 | bool |
| 100 | help | 106 | help |