Author: ian
Date: Sun Aug 11 20:47:01 2019
New Revision: 350866
URL: https://svnweb.freebsd.org/changeset/base/350866
Log:
MFC r342102 (by gonzo):
[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
Modified:
stable/12/sys/dev/iicbus/twsi/mv_twsi.c
stable/12/sys/dev/iicbus/twsi/twsi.h
Directory Properties:
stable/12/ (props changed)
Modified: stable/12/sys/dev/iicbus/twsi/mv_twsi.c
==============================================================================
--- stable/12/sys/dev/iicbus/twsi/mv_twsi.c Sun Aug 11 20:34:24 2019
(r350865)
+++ stable/12/sys/dev/iicbus/twsi/mv_twsi.c Sun Aug 11 20:47:01 2019
(r350866)
@@ -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: stable/12/sys/dev/iicbus/twsi/twsi.h
==============================================================================
--- stable/12/sys/dev/iicbus/twsi/twsi.h Sun Aug 11 20:34:24 2019
(r350865)
+++ stable/12/sys/dev/iicbus/twsi/twsi.h Sun Aug 11 20:47:01 2019
(r350866)
@@ -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;
@@ -50,8 +52,10 @@ struct twsi_softc {
device_t iicbus;
void * intrhand;
bool have_intr;
+#ifdef EXT_RESOURCES
clk_t clk_core;
clk_t clk_reg;
+#endif
struct iic_msg *msg;
uint16_t sent_bytes;
_______________________________________________
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
