diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2012-05-11 09:28:35 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-05-11 09:28:35 -0700 |
| commit | 4e25651b70b8d6ded7229ead8181619e121b648d (patch) | |
| tree | 35b8366cb557a75e5fcb8b10c9d7d13d975d4216 /arch/m68k/platform/528x/config.c | |
| parent | mm: raise MemFree by reverting percpu_pagelist_fraction to 0 (diff) | |
| parent | m68knommu: enable qspi support when SPI_COLDFIRE_QSPI = m (diff) | |
| download | linux-dev-4e25651b70b8d6ded7229ead8181619e121b648d.tar.xz linux-dev-4e25651b70b8d6ded7229ead8181619e121b648d.zip | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu
Pull a m68knommu fix from Greg Ungerer:
"It contains a single fix for including the ColdFire QSPI interface
setup code when enabled as a module. This was broken in the
consolidation of the ColdFire SoC device tables in the 3.4 merge
window."
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu:
m68knommu: enable qspi support when SPI_COLDFIRE_QSPI = m
Diffstat (limited to 'arch/m68k/platform/528x/config.c')
| -rw-r--r-- | arch/m68k/platform/528x/config.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/m68k/platform/528x/config.c b/arch/m68k/platform/528x/config.c index d4492926614c..c5f11ba49be5 100644 --- a/arch/m68k/platform/528x/config.c +++ b/arch/m68k/platform/528x/config.c @@ -24,7 +24,7 @@ /***************************************************************************/ -#ifdef CONFIG_SPI_COLDFIRE_QSPI +#if IS_ENABLED(CONFIG_SPI_COLDFIRE_QSPI) static void __init m528x_qspi_init(void) { @@ -32,7 +32,7 @@ static void __init m528x_qspi_init(void) __raw_writeb(0x07, MCFGPIO_PQSPAR); } -#endif /* CONFIG_SPI_COLDFIRE_QSPI */ +#endif /* IS_ENABLED(CONFIG_SPI_COLDFIRE_QSPI) */ /***************************************************************************/ @@ -98,7 +98,7 @@ void __init config_BSP(char *commandp, int size) mach_sched_init = hw_timer_init; m528x_uarts_init(); m528x_fec_init(); -#ifdef CONFIG_SPI_COLDFIRE_QSPI +#if IS_ENABLED(CONFIG_SPI_COLDFIRE_QSPI) m528x_qspi_init(); #endif } |