summaryrefslogtreecommitdiffstats
path: root/arch/m68k/platform/527x/config.c
diff options
context:
space:
mode:
authorSteven King <sfking@fdwdc.com>2012-05-06 12:22:53 -0700
committerGreg Ungerer <gerg@uclinux.org>2012-05-08 13:06:51 +1000
commit83ca60094e5e907b8b43c60b4c29b1119604cbb8 (patch)
treec29bc1f8db186f1c6adcb205c0b7cbe1be3cef2e /arch/m68k/platform/527x/config.c
parentd48b97b403d23f6df0b990cee652bdf9a52337a3 (diff)
downloadop-kernel-dev-83ca60094e5e907b8b43c60b4c29b1119604cbb8.zip
op-kernel-dev-83ca60094e5e907b8b43c60b4c29b1119604cbb8.tar.gz
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/527x/config.c')
-rw-r--r--arch/m68k/platform/527x/config.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/m68k/platform/527x/config.c b/arch/m68k/platform/527x/config.c
index f91a532..b3cb378 100644
--- a/arch/m68k/platform/527x/config.c
+++ b/arch/m68k/platform/527x/config.c
@@ -23,7 +23,7 @@
/***************************************************************************/
-#ifdef CONFIG_SPI_COLDFIRE_QSPI
+#if IS_ENABLED(CONFIG_SPI_COLDFIRE_QSPI)
static void __init m527x_qspi_init(void)
{
@@ -42,7 +42,7 @@ static void __init m527x_qspi_init(void)
#endif
}
-#endif /* CONFIG_SPI_COLDFIRE_QSPI */
+#endif /* IS_ENABLED(CONFIG_SPI_COLDFIRE_QSPI) */
/***************************************************************************/
@@ -90,7 +90,7 @@ void __init config_BSP(char *commandp, int size)
mach_sched_init = hw_timer_init;
m527x_uarts_init();
m527x_fec_init();
-#ifdef CONFIG_SPI_COLDFIRE_QSPI
+#if IS_ENABLED(CONFIG_SPI_COLDFIRE_QSPI)
m527x_qspi_init();
#endif
}
OpenPOWER on IntegriCloud