diff options
| author | Greg Ungerer <gerg@uclinux.org> | 2016-01-11 10:07:49 +1000 |
|---|---|---|
| committer | Greg Ungerer <gerg@uclinux.org> | 2016-03-07 10:07:17 +1000 |
| commit | ca6fafd183d6d687a7957e5328ecefc785f22a5a (patch) | |
| tree | ca6d96f1dd6514eb55e43ce19cc007eab3926644 /arch/m68k | |
| parent | f6cede5b49e822ebc41a099fe41ab4989f64e2cb (diff) | |
| download | op-kernel-dev-ca6fafd183d6d687a7957e5328ecefc785f22a5a.zip op-kernel-dev-ca6fafd183d6d687a7957e5328ecefc785f22a5a.tar.gz | |
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')
| -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 71ea4c0..a0fc0c1 100644 --- a/arch/m68k/coldfire/device.c +++ b/arch/m68k/coldfire/device.c @@ -89,7 +89,7 @@ static struct platform_device mcf_uart = { .dev.platform_data = mcf_uart_platform_data, }; -#ifdef CONFIG_FEC +#if IS_ENABLED(CONFIG_FEC) #ifdef CONFIG_M5441x #define FEC_NAME "enet-fec" @@ -329,7 +329,7 @@ static struct platform_device mcf_qspi = { static struct platform_device *mcf_devices[] __initdata = { &mcf_uart, -#ifdef CONFIG_FEC +#if IS_ENABLED(CONFIG_FEC) &mcf_fec0, #ifdef MCFFEC_BASE1 &mcf_fec1, |
