svn commit: r342102 - head/sys/dev/iicbus/twsi

[Oleksandr Tymoshenko]

Author: gonzo
Date: Fri Dec 14 21:17:42 2018
New Revision: 342102
URL: https://svnweb.freebsd.org/changeset/base/342102

Log:
  [twsi] Make extres/clk part conditional based on the EXT_RESOURCES option value
  
  This should fix kernel build for ARMADA38X and possibly some other ARM configs
  
  Approved by:	manu

Modified:
  head/sys/dev/iicbus/twsi/mv_twsi.c
  head/sys/dev/iicbus/twsi/twsi.h

Modified: head/sys/dev/iicbus/twsi/mv_twsi.c
==============================================================================
--- head/sys/dev/iicbus/twsi/mv_twsi.c	Fri Dec 14 21:16:04 2018	(r342101)
+++ head/sys/dev/iicbus/twsi/mv_twsi.c	Fri Dec 14 21:17:42 2018	(r342102)
@@ -61,7 +61,9 @@ __FBSDID("$FreeBSD$");
 #include <dev/ofw/ofw_bus.h>
 #include <dev/ofw/ofw_bus_subr.h>
 
+#ifdef EXT_RESOURCES
 #include <dev/extres/clk/clk.h>
+#endif
 
 #include <arm/mv/mvreg.h>
 #include <arm/mv/mvvar.h>

Modified: head/sys/dev/iicbus/twsi/twsi.h
==============================================================================
--- head/sys/dev/iicbus/twsi/twsi.h	Fri Dec 14 21:16:04 2018	(r342101)
+++ head/sys/dev/iicbus/twsi/twsi.h	Fri Dec 14 21:17:42 2018	(r342102)
@@ -34,7 +34,9 @@
 #ifndef _TWSI_H_
 #define	_TWSI_H_
 
+#ifdef EXT_RESOURCES
 #include <dev/extres/clk/clk.h>
+#endif
 
 struct twsi_baud_rate {
 	uint32_t	raw;
@@ -48,8 +50,10 @@ struct twsi_softc {
 	struct resource	*res[1];	/* SYS_RES_MEMORY */
 	struct mtx	mutex;
 	device_t	iicbus;
+#ifdef EXT_RESOURCES
 	clk_t		clk_core;
 	clk_t		clk_reg;
+#endif
 
 	bus_size_t	reg_data;
 	bus_size_t	reg_slave_addr;