diff options
| author | Kukjin Kim <kgene.kim@samsung.com> | 2011-10-04 05:57:43 -0400 |
|---|---|---|
| committer | Kukjin Kim <kgene.kim@samsung.com> | 2011-10-04 05:57:43 -0400 |
| commit | 22be71ea8bf7e9f907e916bf9f6c2bbea9f42553 (patch) | |
| tree | edf517ccf09aec82c6a30e69ef885a785fa77167 /arch/arm/plat-s5p/Kconfig | |
| parent | 59ca37f74a6e9d3e9367359f2fcbb286df7d9748 (diff) | |
| parent | b391f8cf606679e97b02e3b9dca8a1d9956a5301 (diff) | |
Merge branch 'next/topic-gpio-samsung' into next-samsung-devel
Diffstat (limited to 'arch/arm/plat-s5p/Kconfig')
| -rw-r--r-- | arch/arm/plat-s5p/Kconfig | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/arch/arm/plat-s5p/Kconfig b/arch/arm/plat-s5p/Kconfig index 9843c954c042..ac610bee2cb3 100644 --- a/arch/arm/plat-s5p/Kconfig +++ b/arch/arm/plat-s5p/Kconfig | |||
| @@ -16,9 +16,6 @@ config PLAT_S5P | |||
| 16 | select S3C_GPIO_TRACK | 16 | select S3C_GPIO_TRACK |
| 17 | select S5P_GPIO_DRVSTR | 17 | select S5P_GPIO_DRVSTR |
| 18 | select SAMSUNG_GPIOLIB_4BIT | 18 | select SAMSUNG_GPIOLIB_4BIT |
| 19 | select S3C_GPIO_CFG_S3C64XX | ||
| 20 | select S3C_GPIO_PULL_UPDOWN | ||
| 21 | select S3C_GPIO_CFG_S3C24XX | ||
| 22 | select PLAT_SAMSUNG | 19 | select PLAT_SAMSUNG |
| 23 | select SAMSUNG_CLKSRC | 20 | select SAMSUNG_CLKSRC |
| 24 | select SAMSUNG_IRQ_VIC_TIMER | 21 | select SAMSUNG_IRQ_VIC_TIMER |