Skip to content

Commit 6a11af7

Browse files
rddunlapkuba-moo
authored andcommitted
revert "s390/net: lcs: use IS_ENABLED() for kconfig detection"
The referenced patch is causing build errors when ETHERNET=y and FDDI=m. While we work out the preferred patch(es), revert this patch to make the pain go away. Fixes: 1282723 ("s390/net: lcs: use IS_ENABLED() for kconfig detection") Signed-off-by: Randy Dunlap <rdunlap@infradead.org> Reported-by: kernel test robot <lkp@intel.com> Link: lore.kernel.org/r/202306202129.pl0AqK8G-lkp@intel.com Cc: Alexandra Winter <wintera@linux.ibm.com> Cc: Wenjia Zhang <wenjia@linux.ibm.com> Cc: Heiko Carstens <hca@linux.ibm.com> Cc: Vasily Gorbik <gor@linux.ibm.com> Cc: Alexander Gordeev <agordeev@linux.ibm.com> Cc: Christian Borntraeger <borntraeger@linux.ibm.com> Cc: Sven Schnelle <svens@linux.ibm.com> Reviewed-by: Simon Horman <simon.horman@corigine.com> Link: https://lore.kernel.org/r/20230622155409.27311-1-rdunlap@infradead.org Signed-off-by: Jakub Kicinski <kuba@kernel.org>
1 parent 28e219a commit 6a11af7

1 file changed

Lines changed: 5 additions & 5 deletions

File tree

drivers/s390/net/lcs.c

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
#include "lcs.h"
3737

3838

39-
#if !IS_ENABLED(CONFIG_ETHERNET) && !IS_ENABLED(CONFIG_FDDI)
39+
#if !defined(CONFIG_ETHERNET) && !defined(CONFIG_FDDI)
4040
#error Cannot compile lcs.c without some net devices switched on.
4141
#endif
4242

@@ -1601,14 +1601,14 @@ lcs_startlan_auto(struct lcs_card *card)
16011601
int rc;
16021602

16031603
LCS_DBF_TEXT(2, trace, "strtauto");
1604-
#if IS_ENABLED(CONFIG_ETHERNET)
1604+
#ifdef CONFIG_ETHERNET
16051605
card->lan_type = LCS_FRAME_TYPE_ENET;
16061606
rc = lcs_send_startlan(card, LCS_INITIATOR_TCPIP);
16071607
if (rc == 0)
16081608
return 0;
16091609

16101610
#endif
1611-
#if IS_ENABLED(CONFIG_FDDI)
1611+
#ifdef CONFIG_FDDI
16121612
card->lan_type = LCS_FRAME_TYPE_FDDI;
16131613
rc = lcs_send_startlan(card, LCS_INITIATOR_TCPIP);
16141614
if (rc == 0)
@@ -2140,13 +2140,13 @@ lcs_new_device(struct ccwgroup_device *ccwgdev)
21402140
goto netdev_out;
21412141
}
21422142
switch (card->lan_type) {
2143-
#if IS_ENABLED(CONFIG_ETHERNET)
2143+
#ifdef CONFIG_ETHERNET
21442144
case LCS_FRAME_TYPE_ENET:
21452145
card->lan_type_trans = eth_type_trans;
21462146
dev = alloc_etherdev(0);
21472147
break;
21482148
#endif
2149-
#if IS_ENABLED(CONFIG_FDDI)
2149+
#ifdef CONFIG_FDDI
21502150
case LCS_FRAME_TYPE_FDDI:
21512151
card->lan_type_trans = fddi_type_trans;
21522152
dev = alloc_fddidev(0);

0 commit comments

Comments
 (0)