From owner-svn-src-stable@FreeBSD.ORG  Sat Apr 21 00:28:29 2012
Return-Path: <owner-svn-src-stable@FreeBSD.ORG>
Delivered-To: svn-src-stable@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id D421C106566B;
	Sat, 21 Apr 2012 00:28:29 +0000 (UTC)
	(envelope-from marius@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id BDDCD8FC0A;
	Sat, 21 Apr 2012 00:28:29 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q3L0STRc062838;
	Sat, 21 Apr 2012 00:28:29 GMT (envelope-from marius@svn.freebsd.org)
Received: (from marius@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q3L0ST4O062836;
	Sat, 21 Apr 2012 00:28:29 GMT (envelope-from marius@svn.freebsd.org)
Message-Id: <201204210028.q3L0ST4O062836@svn.freebsd.org>
From: Marius Strobl <marius@FreeBSD.org>
Date: Sat, 21 Apr 2012 00:28:29 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org
X-SVN-Group: stable-7
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r234521 - stable/7/sys/dev/mmc
X-BeenThere: svn-src-stable@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for all the -stable branches of the src tree
	<svn-src-stable.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>, 
	<mailto:svn-src-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable>
List-Post: <mailto:svn-src-stable@freebsd.org>
List-Help: <mailto:svn-src-stable-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
	<mailto:svn-src-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 21 Apr 2012 00:28:29 -0000

Author: marius
Date: Sat Apr 21 00:28:29 2012
New Revision: 234521
URL: http://svn.freebsd.org/changeset/base/234521

Log:
  MFC: r189727
  
  read_ivar takes a uintptr_t * not a u_char *.

Modified:
  stable/7/sys/dev/mmc/mmc.c
Directory Properties:
  stable/7/sys/   (props changed)
  stable/7/sys/cddl/contrib/opensolaris/   (props changed)
  stable/7/sys/contrib/dev/acpica/   (props changed)
  stable/7/sys/contrib/pf/   (props changed)

Modified: stable/7/sys/dev/mmc/mmc.c
==============================================================================
--- stable/7/sys/dev/mmc/mmc.c	Sat Apr 21 00:26:03 2012	(r234520)
+++ stable/7/sys/dev/mmc/mmc.c	Sat Apr 21 00:28:29 2012	(r234521)
@@ -1437,7 +1437,7 @@ mmc_scan(struct mmc_softc *sc)
 }
 
 static int
-mmc_read_ivar(device_t bus, device_t child, int which, u_char *result)
+mmc_read_ivar(device_t bus, device_t child, int which, uintptr_t *result)
 {
 	struct mmc_ivars *ivar = device_get_ivars(child);