mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-10-02 23:27:06 +00:00
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>
This commit is contained in:
parent
f6cede5b49
commit
ca6fafd183
1 changed files with 2 additions and 2 deletions
|
@ -89,7 +89,7 @@ static struct platform_device mcf_uart = {
|
||||||
.dev.platform_data = mcf_uart_platform_data,
|
.dev.platform_data = mcf_uart_platform_data,
|
||||||
};
|
};
|
||||||
|
|
||||||
#ifdef CONFIG_FEC
|
#if IS_ENABLED(CONFIG_FEC)
|
||||||
|
|
||||||
#ifdef CONFIG_M5441x
|
#ifdef CONFIG_M5441x
|
||||||
#define FEC_NAME "enet-fec"
|
#define FEC_NAME "enet-fec"
|
||||||
|
@ -329,7 +329,7 @@ static struct platform_device mcf_qspi = {
|
||||||
|
|
||||||
static struct platform_device *mcf_devices[] __initdata = {
|
static struct platform_device *mcf_devices[] __initdata = {
|
||||||
&mcf_uart,
|
&mcf_uart,
|
||||||
#ifdef CONFIG_FEC
|
#if IS_ENABLED(CONFIG_FEC)
|
||||||
&mcf_fec0,
|
&mcf_fec0,
|
||||||
#ifdef MCFFEC_BASE1
|
#ifdef MCFFEC_BASE1
|
||||||
&mcf_fec1,
|
&mcf_fec1,
|
||||||
|
|
Loading…
Reference in a new issue