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

diff --cc drivers/net/ethernet/smsc/smc91x.c
index cbde83f620a0884f613c2be01e194de1547df085,56c36798cb111b4ce6895d0d245ba2cef3a39358..bc19db2dbafbcf5f131d31f785a86cfb73e28ab9
--- 1/drivers/net/ethernet/smsc/smc91x.c
--- 2/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

diff --cc drivers/tty/serial/sh-sci.c
Simple merge