diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-05-25 16:47:48 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-05-25 16:47:48 -0400 |
| commit | 586893ebc42943008010b4c210cfc9167df615e5 (patch) | |
| tree | eec3179235978fba9ca6bfae0799d97c8532ee15 /arch/arm/mach-exynos4/Kconfig | |
| parent | 014322dac6ae0048c928c6ca2faf0d53194f9d15 (diff) | |
| parent | bd6356bdafc853201168f718f0059fbe11191461 (diff) | |
Merge branch 'for-rmk' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into devel-stable
Conflicts:
arch/arm/Kconfig
arch/arm/mach-exynos4/mach-nuri.c
Diffstat (limited to 'arch/arm/mach-exynos4/Kconfig')
| -rw-r--r-- | arch/arm/mach-exynos4/Kconfig | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/mach-exynos4/Kconfig b/arch/arm/mach-exynos4/Kconfig index 805196207ce8..b92c1e557145 100644 --- a/arch/arm/mach-exynos4/Kconfig +++ b/arch/arm/mach-exynos4/Kconfig | |||
| @@ -169,9 +169,11 @@ config MACH_NURI | |||
| 169 | select S3C_DEV_HSMMC2 | 169 | select S3C_DEV_HSMMC2 |
| 170 | select S3C_DEV_HSMMC3 | 170 | select S3C_DEV_HSMMC3 |
| 171 | select S3C_DEV_I2C1 | 171 | select S3C_DEV_I2C1 |
| 172 | select S3C_DEV_I2C3 | ||
| 172 | select S3C_DEV_I2C5 | 173 | select S3C_DEV_I2C5 |
| 173 | select S5P_DEV_USB_EHCI | 174 | select S5P_DEV_USB_EHCI |
| 174 | select EXYNOS4_SETUP_I2C1 | 175 | select EXYNOS4_SETUP_I2C1 |
| 176 | select EXYNOS4_SETUP_I2C3 | ||
| 175 | select EXYNOS4_SETUP_I2C5 | 177 | select EXYNOS4_SETUP_I2C5 |
| 176 | select EXYNOS4_SETUP_SDHCI | 178 | select EXYNOS4_SETUP_SDHCI |
| 177 | select SAMSUNG_DEV_PWM | 179 | select SAMSUNG_DEV_PWM |