From owner-svn-src-all@freebsd.org  Wed Nov  2 23:44:31 2016
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id F35B0C2C345;
 Wed,  2 Nov 2016 23:44:31 +0000 (UTC)
 (envelope-from jhibbits@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 mx1.freebsd.org (Postfix) with ESMTPS id 7D1ED13BC;
 Wed,  2 Nov 2016 23:44:31 +0000 (UTC)
 (envelope-from jhibbits@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id uA2NiUVx060762;
 Wed, 2 Nov 2016 23:44:30 GMT (envelope-from jhibbits@FreeBSD.org)
Received: (from jhibbits@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id uA2NiUk3060761;
 Wed, 2 Nov 2016 23:44:30 GMT (envelope-from jhibbits@FreeBSD.org)
Message-Id: <201611022344.uA2NiUk3060761@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: jhibbits set sender to
 jhibbits@FreeBSD.org using -f
From: Justin Hibbits <jhibbits@FreeBSD.org>
Date: Wed, 2 Nov 2016 23:44:30 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r308232 - head/sys/dev/sdhci
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 02 Nov 2016 23:44:32 -0000

Author: jhibbits
Date: Wed Nov  2 23:44:30 2016
New Revision: 308232
URL: https://svnweb.freebsd.org/changeset/base/308232

Log:
  Since it's no longer accessing a powerpc-specific register, drop the #ifdef.

Modified:
  head/sys/dev/sdhci/fsl_sdhci.c

Modified: head/sys/dev/sdhci/fsl_sdhci.c
==============================================================================
--- head/sys/dev/sdhci/fsl_sdhci.c	Wed Nov  2 23:43:18 2016	(r308231)
+++ head/sys/dev/sdhci/fsl_sdhci.c	Wed Nov  2 23:44:30 2016	(r308232)
@@ -869,12 +869,10 @@ fsl_sdhci_attach(device_t dev)
 	 *
 	 * XXX need named constants for this stuff.
 	 */
-#ifdef __powerpc__
 	/* P1022 has the '*_BRST_LEN' fields as reserved, always reading 0x10 */
 	if (ofw_bus_is_compatible(dev, "fsl,p1022-esdhc"))
 		WR4(sc, SDHC_WTMK_LVL, 0x10801080);
 	else
-#endif
 		WR4(sc, SDHC_WTMK_LVL, 0x08800880);
 
 	/*