diff options
author | Greg Ungerer <gerg@uclinux.org> | 2016-01-10 19:07:49 -0500 |
---|---|---|
committer | Greg Ungerer <gerg@uclinux.org> | 2016-03-06 19:07:17 -0500 |
commit | ca6fafd183d6d687a7957e5328ecefc785f22a5a (patch) | |
tree | ca6d96f1dd6514eb55e43ce19cc007eab3926644 /arch/m68k/coldfire | |
parent | f6cede5b49e822ebc41a099fe41ab4989f64e2cb (diff) |
m68knommu: fix FEC platform device registration when driver is modular
The FEC (Fast Ethernet Crontroller) module on many ColdFire parts can
be compiled into the kernel, or as a module. Therefore the platform device
support for it is required whenever the driver is enabled - not just when
built into the kernel. Use IS_ENABLED(CONFIG_FEC) instead of a conditional
check on only the driver being built into the kernel.
Signed-off-by: Greg Ungerer <gerg@uclinux.org>
Acked-by: Geert Uytterhoeven <geert@linux-m68k.org>
Diffstat (limited to 'arch/m68k/coldfire')
-rw-r--r-- | arch/m68k/coldfire/device.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/m68k/coldfire/device.c b/arch/m68k/coldfire/device.c index 71ea4c02795d..a0fc0c192427 100644 --- a/arch/m68k/coldfire/device.c +++ b/arch/m68k/coldfire/device.c | |||
@@ -89,7 +89,7 @@ static struct platform_device mcf_uart = { | |||
89 | .dev.platform_data = mcf_uart_platform_data, | 89 | .dev.platform_data = mcf_uart_platform_data, |
90 | }; | 90 | }; |
91 | 91 | ||
92 | #ifdef CONFIG_FEC | 92 | #if IS_ENABLED(CONFIG_FEC) |
93 | 93 | ||
94 | #ifdef CONFIG_M5441x | 94 | #ifdef CONFIG_M5441x |
95 | #define FEC_NAME "enet-fec" | 95 | #define FEC_NAME "enet-fec" |
@@ -329,7 +329,7 @@ static struct platform_device mcf_qspi = { | |||
329 | 329 | ||
330 | static struct platform_device *mcf_devices[] __initdata = { | 330 | static struct platform_device *mcf_devices[] __initdata = { |
331 | &mcf_uart, | 331 | &mcf_uart, |
332 | #ifdef CONFIG_FEC | 332 | #if IS_ENABLED(CONFIG_FEC) |
333 | &mcf_fec0, | 333 | &mcf_fec0, |
334 | #ifdef MCFFEC_BASE1 | 334 | #ifdef MCFFEC_BASE1 |
335 | &mcf_fec1, | 335 | &mcf_fec1, |