diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2013-02-14 13:43:29 +0100 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2013-02-14 15:04:38 +0100 |
| commit | a02e0a831fc43ed580b8161a2ca5c29c3ae813d9 (patch) | |
| tree | b3d38fe588fe09a7df0c676309a25945b8f127d7 | |
| parent | ARM: integrator/versatile: fix NOMMU warnings (diff) | |
| download | linux-a02e0a831fc43ed580b8161a2ca5c29c3ae813d9.tar.xz linux-a02e0a831fc43ed580b8161a2ca5c29c3ae813d9.zip | |
ARM: integrator: fix build with INTEGRATOR_AP off
The conditional declaration of ap_uart_data is broken
and causes this build error:
In file included from arch/arm/mach-integrator/core.c:35:0:
arch/arm/mach-integrator/common.h:6:37: error: expected '=', ',', ';', 'asm' or '__attribute__' before '{' token
Turning the check into an constant-expression if(IS_ENABLED()) statement
creates more readable code and solves this problem as well.
Cc: Linus Walleij <linus.walleij@linaro.org>
Cc: Russell King <linux@arm.linux.org.uk>
| -rw-r--r-- | arch/arm/mach-integrator/common.h | 5 | ||||
| -rw-r--r-- | arch/arm/mach-integrator/core.c | 2 |
2 files changed, 1 insertions, 6 deletions
diff --git a/arch/arm/mach-integrator/common.h b/arch/arm/mach-integrator/common.h index 79197d8b34aa..72516658be1e 100644 --- a/arch/arm/mach-integrator/common.h +++ b/arch/arm/mach-integrator/common.h @@ -1,10 +1,5 @@ #include <linux/amba/serial.h> -#ifdef CONFIG_ARCH_INTEGRATOR_AP extern struct amba_pl010_data ap_uart_data; -#else -/* Not used without Integrator/AP support anyway */ -struct amba_pl010_data ap_uart_data {}; -#endif void integrator_init_early(void); int integrator_init(bool is_cp); void integrator_reserve(void); diff --git a/arch/arm/mach-integrator/core.c b/arch/arm/mach-integrator/core.c index 39c060f75e47..81461d218717 100644 --- a/arch/arm/mach-integrator/core.c +++ b/arch/arm/mach-integrator/core.c @@ -71,7 +71,7 @@ int __init integrator_init(bool is_cp) * hard-code them. The Integator/CP and forward have proper cell IDs. * Else we leave them undefined to the bus driver can autoprobe them. */ - if (!is_cp) { + if (!is_cp && IS_ENABLED(CONFIG_ARCH_INTEGRATOR_AP)) { rtc_device.periphid = 0x00041030; uart0_device.periphid = 0x00041010; uart1_device.periphid = 0x00041010; |