diff options
| author | Trond Myklebust <Trond.Myklebust@netapp.com> | 2012-05-21 10:12:39 -0400 |
|---|---|---|
| committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2012-05-21 10:12:39 -0400 |
| commit | b3f87b98aa3dc22cc58f970140113b270015cddb (patch) | |
| tree | c4aec5996567ad96310f61e9244e799f41bf2625 /arch/m68k/platform/523x | |
| parent | 041245c88a29273788e8eff1353bc6e1f56c61df (diff) | |
| parent | 1afeaf5c29aa07db25760d2fbed5c08a3aec3498 (diff) | |
Merge branch 'bugfixes' into nfs-for-next
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 } |