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/Kconfig | |
| parent | 59ca37f74a6e9d3e9367359f2fcbb286df7d9748 (diff) | |
| parent | b391f8cf606679e97b02e3b9dca8a1d9956a5301 (diff) | |
Merge branch 'next/topic-gpio-samsung' into next-samsung-devel
Diffstat (limited to 'arch/arm/Kconfig')
| -rw-r--r-- | arch/arm/Kconfig | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 3146ed3f6eca..bea81d018312 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig | |||
| @@ -724,9 +724,6 @@ config ARCH_S3C64XX | |||
| 724 | select SAMSUNG_IRQ_VIC_TIMER | 724 | select SAMSUNG_IRQ_VIC_TIMER |
| 725 | select SAMSUNG_IRQ_UART | 725 | select SAMSUNG_IRQ_UART |
| 726 | select S3C_GPIO_TRACK | 726 | select S3C_GPIO_TRACK |
| 727 | select S3C_GPIO_PULL_UPDOWN | ||
| 728 | select S3C_GPIO_CFG_S3C24XX | ||
| 729 | select S3C_GPIO_CFG_S3C64XX | ||
| 730 | select S3C_DEV_NAND | 727 | select S3C_DEV_NAND |
| 731 | select USB_ARCH_HAS_OHCI | 728 | select USB_ARCH_HAS_OHCI |
| 732 | select SAMSUNG_GPIOLIB_4BIT | 729 | select SAMSUNG_GPIOLIB_4BIT |