diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2015-10-12 15:44:49 +0200 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2015-10-14 17:13:59 +0200 |
| commit | 6391074598442b8a8d33e2cfdf277d5568b57f2d (patch) | |
| tree | 283c487f969257aec96f48ef8526db22c17a85b6 /arch/arm/mach-highbank | |
| parent | Merge tag 'imx-fixes-4.3-2' of git://git.kernel.org/pub/scm/linux/kernel/git/... (diff) | |
| download | linux-6391074598442b8a8d33e2cfdf277d5568b57f2d.tar.xz linux-6391074598442b8a8d33e2cfdf277d5568b57f2d.zip | |
ARM: pxa: fix pxa3xx DFI lockup hack
Some recently added code to avoid a bug introduced a build error
when CONFIG_PM is disabled and a macro is hidden:
arch/arm/mach-pxa/pxa3xx.c: In function 'pxa3xx_init':
arch/arm/mach-pxa/pxa3xx.c:439:3: error: 'NDCR' undeclared (first use in this function)
NDCR = (NDCR & ~NDCR_ND_ARB_EN) | NDCR_ND_ARB_CNTL;
^
This moves the macro outside of the #ifdef so it can be
referenced correctly.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Fixes: adf3442cc890 ("ARM: pxa: fix DFI bus lockups on startup")
Acked-by: Robert Jarzmik <robert.jarzmik@free.fr>
Diffstat (limited to 'arch/arm/mach-highbank')
0 files changed, 0 insertions, 0 deletions