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/5249/config.c | |
| parent | d48b97b403d23f6df0b990cee652bdf9a52337a3 (diff) | |
| download | lwn-83ca60094e5e907b8b43c60b4c29b1119604cbb8.tar.gz lwn-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/5249/config.c')
| -rw-r--r-- | arch/m68k/platform/5249/config.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/m68k/platform/5249/config.c b/arch/m68k/platform/5249/config.c index bbf05135bb98..300e729a58d0 100644 --- a/arch/m68k/platform/5249/config.c +++ b/arch/m68k/platform/5249/config.c @@ -51,7 +51,7 @@ static struct platform_device *m5249_devices[] __initdata = { /***************************************************************************/ -#ifdef CONFIG_SPI_COLDFIRE_QSPI +#if IS_ENABLED(CONFIG_SPI_COLDFIRE_QSPI) static void __init m5249_qspi_init(void) { @@ -61,7 +61,7 @@ static void __init m5249_qspi_init(void) mcf_mapirq2imr(MCF_IRQ_QSPI, MCFINTC_QSPI); } -#endif /* CONFIG_SPI_COLDFIRE_QSPI */ +#endif /* IS_ENABLED(CONFIG_SPI_COLDFIRE_QSPI) */ /***************************************************************************/ @@ -90,7 +90,7 @@ void __init config_BSP(char *commandp, int size) #ifdef CONFIG_M5249C3 m5249_smc91x_init(); #endif -#ifdef CONFIG_SPI_COLDFIRE_QSPI +#if IS_ENABLED(CONFIG_SPI_COLDFIRE_QSPI) m5249_qspi_init(); #endif } |