diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2011-12-28 00:18:10 +0000 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2011-12-28 00:18:10 +0000 |
| commit | bd4b9ba4cf9338932a065cd752fb5f28b26e4e39 (patch) | |
| tree | 88725708d3f2696f1c2373cf62d0b997c207e861 /arch/arm/mach-s5p64x0/Kconfig | |
| parent | e814fb635cd269532a6a95a921c05841ababa7ae (diff) | |
| parent | 8a44930a11de8d66f92145fd2d2464ab4fba696b (diff) | |
Merge branch 'samsung/cleanup' into next/drivers
Dependency for the samsung/drivers branch
Conflicts:
arch/arm/mach-exynos/Makefile
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm/mach-s5p64x0/Kconfig')
| -rw-r--r-- | arch/arm/mach-s5p64x0/Kconfig | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/arch/arm/mach-s5p64x0/Kconfig b/arch/arm/mach-s5p64x0/Kconfig index 18690c5f99e..dd8c85ef6da 100644 --- a/arch/arm/mach-s5p64x0/Kconfig +++ b/arch/arm/mach-s5p64x0/Kconfig @@ -36,6 +36,11 @@ config S5P64X0_SETUP_I2C1 help Common setup code for i2c bus 1. +config S5P64X0_SETUP_SPI + bool + help + Common setup code for SPI GPIO configurations + # machine support config MACH_SMDK6440 @@ -45,7 +50,6 @@ config MACH_SMDK6440 select S3C_DEV_I2C1 select S3C_DEV_RTC select S3C_DEV_WDT - select S3C64XX_DEV_SPI select SAMSUNG_DEV_ADC select SAMSUNG_DEV_BACKLIGHT select SAMSUNG_DEV_PWM @@ -62,7 +66,6 @@ config MACH_SMDK6450 select S3C_DEV_I2C1 select S3C_DEV_RTC select S3C_DEV_WDT - select S3C64XX_DEV_SPI select SAMSUNG_DEV_ADC select SAMSUNG_DEV_BACKLIGHT select SAMSUNG_DEV_PWM |