diff options
| author |   Steven King <sfking@fdwdc.com> | 2012-05-06 12:22:53 -0700 |
|---|---|---|
| committer |   Greg Ungerer <gerg@uclinux.org> | 2012-05-08 13:06:51 +1000 |
| commit | 83ca60094e5e907b8b43c60b4c29b1119604cbb8 (patch) | |
| tree | c29bc1f8db186f1c6adcb205c0b7cbe1be3cef2e /arch/m68k/platform/523x | |
| parent | Linux 3.4-rc6 (diff) | |
| download | linux-dev-83ca60094e5e907b8b43c60b4c29b1119604cbb8.tar.xz linux-dev-83ca60094e5e907b8b43c60b4c29b1119604cbb8.zip | |
m68knommu: enable qspi support when SPI_COLDFIRE_QSPI = m
Enable Coldfire QSPI support when SPI_COLDFIRE_QSPI is built as a module.
This version of the patch combines changes to the config files and device.c
and uses IF_ENABLED (thanks to Sam Ravnborg for the suggestion).
Signed-off-by: Steven King <sfking@fdwdc.com>
Signed-off-by: Greg Ungerer <gerg@uclinux.org>
Diffstat (limited to 'arch/m68k/platform/523x')
| -rw-r--r-- | arch/m68k/platform/523x/config.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/m68k/platform/523x/config.c b/arch/m68k/platform/523x/config.c index c8b405d5a961..d47dfd8f50a2 100644 --- a/arch/m68k/platform/523x/config.c +++ b/arch/m68k/platform/523x/config.c @@ -22,7 +22,7 @@ /***************************************************************************/ -#ifdef CONFIG_SPI_COLDFIRE_QSPI +#if IS_ENABLED(CONFIG_SPI_COLDFIRE_QSPI) static void __init m523x_qspi_init(void) { @@ -36,7 +36,7 @@ static void __init m523x_qspi_init(void) writew(par, MCFGPIO_PAR_TIMER); } -#endif /* CONFIG_SPI_COLDFIRE_QSPI */ +#endif /* IS_ENABLED(CONFIG_SPI_COLDFIRE_QSPI) */ /***************************************************************************/ @@ -58,7 +58,7 @@ void __init config_BSP(char *commandp, int size) { mach_sched_init = hw_timer_init; m523x_fec_init(); -#ifdef CONFIG_SPI_COLDFIRE_QSPI +#if IS_ENABLED(CONFIG_SPI_COLDFIRE_QSPI) m523x_qspi_init(); #endif } |