ARM: integrator: fix build with INTEGRATOR_AP off

Browse source

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>

...

This commit is contained in:

Arnd Bergmann 2013-02-14 13:43:29 +01:00

parent 060fd1be0c

commit a02e0a831f

2 changed files with 1 additions and 6 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

5

arch/arm/mach-integrator/common.h

View file

2

arch/arm/mach-integrator/core.c

View file