diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2014-03-18 16:06:37 +0100 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2014-03-18 16:06:37 +0100 |
| commit | b44ce3b0f9c3883e7c537793b808feee9a2a00fb (patch) | |
| tree | 19ff25fe5efadb0129008f406e2df9661e5bb1fb /arch/arm/mach-s3c24xx | |
| parent | 3524080826c289df0efd5159282f6c4aeacf0c11 (diff) | |
| parent | baf64abc468c7583592f67197ae23fa31414b4db (diff) | |
Merge tag 'samsung-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into next/fixes-non-critical
Merge "Samsung non-critical fixes for v3.15" from Kukjin Kim:
- fix typo CONFIG_CPU_S3C2443 in Kconfig
- fix G3D regulator on because of entering low power mode
for exynos5250-arndale
- fix CONFIG_USB_EHCI_EXYNOS for exynos_defconfig
- fix initcall of mach-crag6410-module.c
* tag 'samsung-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung:
ARM: S3C64XX: mach-crag6410-module.c is not modular
ARM: exynos_defconfig: Update EHCI config entry
ARM: dts: Keep G3D regulator always on for exynos5250-arndale
ARM: S3C24XX: Fix typo CONFIG_CPUS_3C2443
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm/mach-s3c24xx')
| -rw-r--r-- | arch/arm/mach-s3c24xx/common.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-s3c24xx/common.c b/arch/arm/mach-s3c24xx/common.c index 4adaa4b43ff..1d77d709ec2 100644 --- a/arch/arm/mach-s3c24xx/common.c +++ b/arch/arm/mach-s3c24xx/common.c @@ -484,7 +484,7 @@ struct platform_device s3c2440_device_dma = { }; #endif -#if defined(CONFIG_CPUS_3C2443) || defined(CONFIG_CPU_S3C2416) +#if defined(CONFIG_CPU_S3C2443) || defined(CONFIG_CPU_S3C2416) static struct resource s3c2443_dma_resource[] = { [0] = DEFINE_RES_MEM(S3C24XX_PA_DMA, S3C24XX_SZ_DMA), [1] = DEFINE_RES_IRQ(IRQ_S3C2443_DMA0), |