Skip to content

Commit

Permalink
m68knommu: fix FEC platform device registration when driver is modular
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Greg Ungerer committed Mar 7, 2016
1 parent f6cede5 commit ca6fafd
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions arch/m68k/coldfire/device.c
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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,
Expand Down

0 comments on commit ca6fafd

Please sign in to comment.