diff options
| author | Olof Johansson <olof@lixom.net> | 2013-04-26 20:32:02 +0200 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2013-04-26 20:35:51 +0200 |
| commit | 4923ee444a39c8b75027ed01a7812e940194dbec (patch) | |
| tree | 660146f078a65463590d9b623d2a37bb263a6b29 /arch/arm/mach-exynos/common.c | |
| parent | ARM: exynos: enable multiplatform support (diff) | |
| download | linux-4923ee444a39c8b75027ed01a7812e940194dbec.tar.xz linux-4923ee444a39c8b75027ed01a7812e940194dbec.zip | |
Revert "ARM: exynos: enable multiplatform support"
This reverts commit bd51de53e1be9896d815bbea30560262216d4616.
Turns out that multiplatform breaks some uses cases, such as when you
have an existing defconfig, since it adds the new EXYNOS_SINGLE config
option as a dependecy. As a result, nearly all exynos config options
will be disabled by default.
Reverting instead of rebasing since this branch is pulled in as a
dependency elsewhere.
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm/mach-exynos/common.c')
| -rw-r--r-- | arch/arm/mach-exynos/common.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/arch/arm/mach-exynos/common.c b/arch/arm/mach-exynos/common.c index 83bd3f0e1519..d63d399c7bae 100644 --- a/arch/arm/mach-exynos/common.c +++ b/arch/arm/mach-exynos/common.c @@ -368,9 +368,6 @@ 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(); @@ -573,8 +570,6 @@ 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); @@ -880,4 +875,3 @@ static int __init exynos_init_irq_eint(void) return 0; } arch_initcall(exynos_init_irq_eint); -#endif |