diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2013-04-19 14:34:05 +0200 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2013-04-19 16:50:56 +0200 |
| commit | 0dc488e778069b208d09516c5f0793dc37023c8e (patch) | |
| tree | 704ad7fa4d8202f1933297e4dd348128a2b9f702 /arch/arm/mach-exynos/common.c | |
| parent | c4c54da24b8ae12abb2034edaf08021894caf0d0 (diff) | |
| parent | bd51de53e1be9896d815bbea30560262216d4616 (diff) | |
| download | linux-3.10-0dc488e778069b208d09516c5f0793dc37023c8e.tar.gz linux-3.10-0dc488e778069b208d09516c5f0793dc37023c8e.tar.bz2 linux-3.10-0dc488e778069b208d09516c5f0793dc37023c8e.zip | |
Merge branch 'samsung/exynos-multiplatform' into next/drivers
Merging this into the next/drivers branch avoids a number of
pointless conflicts with code changed here.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm/mach-exynos/common.c')
| -rw-r--r-- | arch/arm/mach-exynos/common.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/arch/arm/mach-exynos/common.c b/arch/arm/mach-exynos/common.c index 939bda77def..a3ab0ecc7c6 100644 --- a/arch/arm/mach-exynos/common.c +++ b/arch/arm/mach-exynos/common.c @@ -361,6 +361,9 @@ static void __init exynos4_map_io(void) else iotable_init(exynos4_iodesc1, ARRAY_SIZE(exynos4_iodesc1)); + if (!IS_ENABLED(CONFIG_EXYNOS_ATAGS)) + return + /* initialize device information early */ exynos4_default_sdhci0(); exynos4_default_sdhci1(); @@ -546,6 +549,8 @@ static void __init exynos4_init_uarts(struct s3c2410_uartcfg *cfg, int no) s3c24xx_init_uartdevs("exynos4210-uart", exynos4_uart_resources, cfg, no); } + +#ifdef CONFIG_EXYNOS_ATAGS static void __iomem *exynos_eint_base; static DEFINE_SPINLOCK(eint_lock); @@ -852,6 +857,7 @@ static int __init exynos_init_irq_eint(void) return 0; } arch_initcall(exynos_init_irq_eint); +#endif static struct resource exynos4_pmu_resource[] = { DEFINE_RES_IRQ(EXYNOS4_IRQ_PMU), |