From owner-svn-src-head@freebsd.org  Wed Feb 28 19:05:26 2018
Return-Path: <owner-svn-src-head@freebsd.org>
Delivered-To: svn-src-head@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 5AEFEF3D9E2;
 Wed, 28 Feb 2018 19:05:26 +0000 (UTC)
 (envelope-from manu@FreeBSD.org)
Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org
 [IPv6:2610:1c1:1:606c::19:3])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client CN "mxrelay.nyi.freebsd.org",
 Issuer "Let's Encrypt Authority X3" (verified OK))
 by mx1.freebsd.org (Postfix) with ESMTPS id 1014B8823D;
 Wed, 28 Feb 2018 19:05:26 +0000 (UTC)
 (envelope-from manu@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 0605D1D825;
 Wed, 28 Feb 2018 19:05:26 +0000 (UTC)
 (envelope-from manu@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w1SJ5PmI089494;
 Wed, 28 Feb 2018 19:05:25 GMT (envelope-from manu@FreeBSD.org)
Received: (from manu@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id w1SJ5PTY089493;
 Wed, 28 Feb 2018 19:05:25 GMT (envelope-from manu@FreeBSD.org)
Message-Id: <201802281905.w1SJ5PTY089493@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: manu set sender to
 manu@FreeBSD.org using -f
From: Emmanuel Vadot <manu@FreeBSD.org>
Date: Wed, 28 Feb 2018 19:05:25 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r330125 - head/sys/dev/mmc/host
X-SVN-Group: head
X-SVN-Commit-Author: manu
X-SVN-Commit-Paths: head/sys/dev/mmc/host
X-SVN-Commit-Revision: 330125
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.25
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 28 Feb 2018 19:05:26 -0000

Author: manu
Date: Wed Feb 28 19:05:25 2018
New Revision: 330125
URL: https://svnweb.freebsd.org/changeset/base/330125

Log:
  dwmmc_rockchip: Add ifdefs on EXT_RESOURCES
  
  The old RK3188 kernel config uses dwmmc but isn't compiled with EXT_RESOURCES.
  Add ifdefs around code using EXT_RESOURCES code.
  
  Reported by:	rpokala

Modified:
  head/sys/dev/mmc/host/dwmmc_rockchip.c

Modified: head/sys/dev/mmc/host/dwmmc_rockchip.c
==============================================================================
--- head/sys/dev/mmc/host/dwmmc_rockchip.c	Wed Feb 28 18:34:22 2018	(r330124)
+++ head/sys/dev/mmc/host/dwmmc_rockchip.c	Wed Feb 28 19:05:25 2018	(r330125)
@@ -39,6 +39,10 @@ __FBSDID("$FreeBSD$");
 
 #include <dev/ofw/ofw_bus_subr.h>
 
+#ifdef EXT_RESOURCES
+#include <dev/extres/clk/clk.h>
+#endif
+
 #include <dev/mmc/host/dwmmc_var.h>
 
 enum RKTYPE {
@@ -88,11 +92,14 @@ rockchip_dwmmc_attach(device_t dev)
 
 	sc->pwren_inverted = 1;
 
+#ifdef EXT_RESOURCES
 	sc->update_ios = &dwmmc_rockchip_update_ios;
+#endif
 
 	return (dwmmc_attach(dev));
 }
 
+#ifdef EXT_RESOURCES
 static int
 dwmmc_rockchip_update_ios(struct dwmmc_softc *sc, struct mmc_ios *ios)
 {
@@ -119,6 +126,7 @@ dwmmc_rockchip_update_ios(struct dwmmc_softc *sc, stru
 	}
 	return (0);
 }
+#endif
 
 static device_method_t rockchip_dwmmc_methods[] = {
 	/* bus interface */