From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Wed, 2 Jun 2021 23:59:42 +0000 (+1000)
Subject: Merge remote-tracking branch 'h8300/h8300-next'
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=51e08ad1b9bf9a1282d7aeb64b1306d60da13625;p=users%2Fjedix%2Flinux-maple.git

Merge remote-tracking branch 'h8300/h8300-next'
---

51e08ad1b9bf9a1282d7aeb64b1306d60da13625
diff --cc drivers/net/ethernet/smsc/smc91x.c
index cbde83f620a0,56c36798cb11..bc19db2dbafb
--- a/drivers/net/ethernet/smsc/smc91x.c
+++ b/drivers/net/ethernet/smsc/smc91x.c
@@@ -2190,8 -2190,9 +2190,9 @@@ static const struct of_device_id smc91x
  };
  MODULE_DEVICE_TABLE(of, smc91x_match);
  
+ #if defined(CONFIG_GPIOLIB)
  /**
 - * of_try_set_control_gpio - configure a gpio if it exists
 + * try_toggle_control_gpio - configure a gpio if it exists
   * @dev: net device
   * @desc: where to store the GPIO descriptor, if it exists
   * @name: name of the GPIO in DT