tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu

Pull a m68knommu fix from Greg Ungerer:
"It contains a single fix for including the ColdFire QSPI interface
setup code when enabled as a module. This was broken in the
consolidation of the ColdFire SoC device tables in the 3.4 merge
window."

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu:
m68knommu: enable qspi support when SPI_COLDFIRE_QSPI = m

Linus Torvalds 4e25651b 1b76b02f

+21 -21
+3 -3
arch/m68k/platform/520x/config.c
··· 22 22 23 23 /***************************************************************************/ 24 24 25 - #ifdef CONFIG_SPI_COLDFIRE_QSPI 25 + #if IS_ENABLED(CONFIG_SPI_COLDFIRE_QSPI) 26 26 27 27 static void __init m520x_qspi_init(void) 28 28 { ··· 35 35 writew(par, MCF_GPIO_PAR_UART); 36 36 } 37 37 38 - #endif /* CONFIG_SPI_COLDFIRE_QSPI */ 38 + #endif /* IS_ENABLED(CONFIG_SPI_COLDFIRE_QSPI) */ 39 39 40 40 /***************************************************************************/ 41 41 ··· 79 79 mach_sched_init = hw_timer_init; 80 80 m520x_uarts_init(); 81 81 m520x_fec_init(); 82 - #ifdef CONFIG_SPI_COLDFIRE_QSPI 82 + #if IS_ENABLED(CONFIG_SPI_COLDFIRE_QSPI) 83 83 m520x_qspi_init(); 84 84 #endif 85 85 }
+3 -3
arch/m68k/platform/523x/config.c
··· 22 22 23 23 /***************************************************************************/ 24 24 25 - #ifdef CONFIG_SPI_COLDFIRE_QSPI 25 + #if IS_ENABLED(CONFIG_SPI_COLDFIRE_QSPI) 26 26 27 27 static void __init m523x_qspi_init(void) 28 28 { ··· 36 36 writew(par, MCFGPIO_PAR_TIMER); 37 37 } 38 38 39 - #endif /* CONFIG_SPI_COLDFIRE_QSPI */ 39 + #endif /* IS_ENABLED(CONFIG_SPI_COLDFIRE_QSPI) */ 40 40 41 41 /***************************************************************************/ 42 42 ··· 58 58 { 59 59 mach_sched_init = hw_timer_init; 60 60 m523x_fec_init(); 61 - #ifdef CONFIG_SPI_COLDFIRE_QSPI 61 + #if IS_ENABLED(CONFIG_SPI_COLDFIRE_QSPI) 62 62 m523x_qspi_init(); 63 63 #endif 64 64 }
+3 -3
arch/m68k/platform/5249/config.c
··· 51 51 52 52 /***************************************************************************/ 53 53 54 - #ifdef CONFIG_SPI_COLDFIRE_QSPI 54 + #if IS_ENABLED(CONFIG_SPI_COLDFIRE_QSPI) 55 55 56 56 static void __init m5249_qspi_init(void) 57 57 { ··· 61 61 mcf_mapirq2imr(MCF_IRQ_QSPI, MCFINTC_QSPI); 62 62 } 63 63 64 - #endif /* CONFIG_SPI_COLDFIRE_QSPI */ 64 + #endif /* IS_ENABLED(CONFIG_SPI_COLDFIRE_QSPI) */ 65 65 66 66 /***************************************************************************/ 67 67 ··· 90 90 #ifdef CONFIG_M5249C3 91 91 m5249_smc91x_init(); 92 92 #endif 93 - #ifdef CONFIG_SPI_COLDFIRE_QSPI 93 + #if IS_ENABLED(CONFIG_SPI_COLDFIRE_QSPI) 94 94 m5249_qspi_init(); 95 95 #endif 96 96 }
+3 -3
arch/m68k/platform/527x/config.c
··· 23 23 24 24 /***************************************************************************/ 25 25 26 - #ifdef CONFIG_SPI_COLDFIRE_QSPI 26 + #if IS_ENABLED(CONFIG_SPI_COLDFIRE_QSPI) 27 27 28 28 static void __init m527x_qspi_init(void) 29 29 { ··· 42 42 #endif 43 43 } 44 44 45 - #endif /* CONFIG_SPI_COLDFIRE_QSPI */ 45 + #endif /* IS_ENABLED(CONFIG_SPI_COLDFIRE_QSPI) */ 46 46 47 47 /***************************************************************************/ 48 48 ··· 90 90 mach_sched_init = hw_timer_init; 91 91 m527x_uarts_init(); 92 92 m527x_fec_init(); 93 - #ifdef CONFIG_SPI_COLDFIRE_QSPI 93 + #if IS_ENABLED(CONFIG_SPI_COLDFIRE_QSPI) 94 94 m527x_qspi_init(); 95 95 #endif 96 96 }
+3 -3
arch/m68k/platform/528x/config.c
··· 24 24 25 25 /***************************************************************************/ 26 26 27 - #ifdef CONFIG_SPI_COLDFIRE_QSPI 27 + #if IS_ENABLED(CONFIG_SPI_COLDFIRE_QSPI) 28 28 29 29 static void __init m528x_qspi_init(void) 30 30 { ··· 32 32 __raw_writeb(0x07, MCFGPIO_PQSPAR); 33 33 } 34 34 35 - #endif /* CONFIG_SPI_COLDFIRE_QSPI */ 35 + #endif /* IS_ENABLED(CONFIG_SPI_COLDFIRE_QSPI) */ 36 36 37 37 /***************************************************************************/ 38 38 ··· 98 98 mach_sched_init = hw_timer_init; 99 99 m528x_uarts_init(); 100 100 m528x_fec_init(); 101 - #ifdef CONFIG_SPI_COLDFIRE_QSPI 101 + #if IS_ENABLED(CONFIG_SPI_COLDFIRE_QSPI) 102 102 m528x_qspi_init(); 103 103 #endif 104 104 }
+3 -3
arch/m68k/platform/532x/config.c
··· 30 30 31 31 /***************************************************************************/ 32 32 33 - #ifdef CONFIG_SPI_COLDFIRE_QSPI 33 + #if IS_ENABLED(CONFIG_SPI_COLDFIRE_QSPI) 34 34 35 35 static void __init m532x_qspi_init(void) 36 36 { ··· 38 38 writew(0x01f0, MCF_GPIO_PAR_QSPI); 39 39 } 40 40 41 - #endif /* CONFIG_SPI_COLDFIRE_QSPI */ 41 + #endif /* IS_ENABLED(CONFIG_SPI_COLDFIRE_QSPI) */ 42 42 43 43 /***************************************************************************/ 44 44 ··· 77 77 mach_sched_init = hw_timer_init; 78 78 m532x_uarts_init(); 79 79 m532x_fec_init(); 80 - #ifdef CONFIG_SPI_COLDFIRE_QSPI 80 + #if IS_ENABLED(CONFIG_SPI_COLDFIRE_QSPI) 81 81 m532x_qspi_init(); 82 82 #endif 83 83
+3 -3
arch/m68k/platform/coldfire/device.c
··· 121 121 #endif /* MCFFEC_BASE1 */ 122 122 #endif /* CONFIG_FEC */ 123 123 124 - #ifdef CONFIG_SPI_COLDFIRE_QSPI 124 + #if IS_ENABLED(CONFIG_SPI_COLDFIRE_QSPI) 125 125 /* 126 126 * The ColdFire QSPI module is an SPI protocol hardware block used 127 127 * on a number of different ColdFire CPUs. ··· 274 274 .resource = mcf_qspi_resources, 275 275 .dev.platform_data = &mcf_qspi_data, 276 276 }; 277 - #endif /* CONFIG_SPI_COLDFIRE_QSPI */ 277 + #endif /* IS_ENABLED(CONFIG_SPI_COLDFIRE_QSPI) */ 278 278 279 279 static struct platform_device *mcf_devices[] __initdata = { 280 280 &mcf_uart, ··· 284 284 &mcf_fec1, 285 285 #endif 286 286 #endif 287 - #ifdef CONFIG_SPI_COLDFIRE_QSPI 287 + #if IS_ENABLED(CONFIG_SPI_COLDFIRE_QSPI) 288 288 &mcf_qspi, 289 289 #endif 290 290 };