diff options
| author | H. Peter Anvin <hpa@zytor.com> | 2012-05-21 12:17:50 -0700 |
|---|---|---|
| committer | H. Peter Anvin <hpa@zytor.com> | 2012-05-21 12:17:50 -0700 |
| commit | d13a822e6d08733cc69dd8c2f5d82eacb1474295 (patch) | |
| tree | 2b39613c0d8cce9eb3b15adb1525a2c72f46d392 /arch/m68k/platform/520x | |
| parent | 29d679ffd850ea37a303bb930142be14982611e4 (diff) | |
| parent | 76e10d158efb6d4516018846f60c2ab5501900bc (diff) | |
| download | op-kernel-dev-d13a822e6d08733cc69dd8c2f5d82eacb1474295.zip op-kernel-dev-d13a822e6d08733cc69dd8c2f5d82eacb1474295.tar.gz | |
Merge commit 'v3.4' into x86/urgent
Diffstat (limited to 'arch/m68k/platform/520x')
| -rw-r--r-- | arch/m68k/platform/520x/config.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/m68k/platform/520x/config.c b/arch/m68k/platform/520x/config.c index 23594784..09df4b8 100644 --- a/arch/m68k/platform/520x/config.c +++ b/arch/m68k/platform/520x/config.c @@ -22,7 +22,7 @@ /***************************************************************************/ -#ifdef CONFIG_SPI_COLDFIRE_QSPI +#if IS_ENABLED(CONFIG_SPI_COLDFIRE_QSPI) static void __init m520x_qspi_init(void) { @@ -35,7 +35,7 @@ static void __init m520x_qspi_init(void) writew(par, MCF_GPIO_PAR_UART); } -#endif /* CONFIG_SPI_COLDFIRE_QSPI */ +#endif /* IS_ENABLED(CONFIG_SPI_COLDFIRE_QSPI) */ /***************************************************************************/ @@ -79,7 +79,7 @@ void __init config_BSP(char *commandp, int size) mach_sched_init = hw_timer_init; m520x_uarts_init(); m520x_fec_init(); -#ifdef CONFIG_SPI_COLDFIRE_QSPI +#if IS_ENABLED(CONFIG_SPI_COLDFIRE_QSPI) m520x_qspi_init(); #endif } |
