Skip to content

Commit 63a24cf

Browse files
ordexGreg Ungerer
authored andcommitted
m68k: coldfire/device.c: only build FEC when HW macros are defined
When CONFIG_FEC is set (due to COMPILE_TEST) along with CONFIG_M54xx, coldfire/device.c has compile errors due to missing MCFEC_* and MCF_IRQ_FEC_* symbols. Make the whole FEC blocks dependent on having the HW macros defined, rather than on CONFIG_FEC itself. This fix is very similar to commit e6e1e7b ("m68k: coldfire/device.c: only build for MCF_EDMA when h/w macros are defined") Fixes: b7ce7f0 ("m68knommu: merge common ColdFire FEC platform setup code") To: Greg Ungerer <gerg@linux-m68k.org> To: Geert Uytterhoeven <geert@linux-m68k.org> Cc: linux-m68k@lists.linux-m68k.org Cc: linux-kernel@vger.kernel.org Signed-off-by: Antonio Quartulli <antonio@mandelbit.com> Signed-off-by: Greg Ungerer <gerg@kernel.org>
1 parent f212140 commit 63a24cf

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

arch/m68k/coldfire/device.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ static struct platform_device mcf_uart = {
9393
.dev.platform_data = mcf_uart_platform_data,
9494
};
9595

96-
#if IS_ENABLED(CONFIG_FEC)
96+
#ifdef MCFFEC_BASE0
9797

9898
#ifdef CONFIG_M5441x
9999
#define FEC_NAME "enet-fec"
@@ -145,6 +145,7 @@ static struct platform_device mcf_fec0 = {
145145
.platform_data = FEC_PDATA,
146146
}
147147
};
148+
#endif /* MCFFEC_BASE0 */
148149

149150
#ifdef MCFFEC_BASE1
150151
static struct resource mcf_fec1_resources[] = {
@@ -182,7 +183,6 @@ static struct platform_device mcf_fec1 = {
182183
}
183184
};
184185
#endif /* MCFFEC_BASE1 */
185-
#endif /* CONFIG_FEC */
186186

187187
#if IS_ENABLED(CONFIG_SPI_COLDFIRE_QSPI)
188188
/*
@@ -624,12 +624,12 @@ static struct platform_device mcf_flexcan0 = {
624624

625625
static struct platform_device *mcf_devices[] __initdata = {
626626
&mcf_uart,
627-
#if IS_ENABLED(CONFIG_FEC)
627+
#ifdef MCFFEC_BASE0
628628
&mcf_fec0,
629+
#endif
629630
#ifdef MCFFEC_BASE1
630631
&mcf_fec1,
631632
#endif
632-
#endif
633633
#if IS_ENABLED(CONFIG_SPI_COLDFIRE_QSPI)
634634
&mcf_qspi,
635635
#endif

0 commit comments

Comments
 (0)