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

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

819dc6d91282d1391651bcbba4616d1cfd3d48fc
diff --cc drivers/net/ethernet/smsc/smc91x.c
index 813ea941b91a3,56c36798cb111..e4fc6484faa8d
--- 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