From owner-svn-src-head@FreeBSD.ORG  Wed Oct 22 15:00:22 2008
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 6DA2F1065672;
	Wed, 22 Oct 2008 15:00:22 +0000 (UTC) (envelope-from jhb@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 5BCAF8FC08;
	Wed, 22 Oct 2008 15:00:22 +0000 (UTC) (envelope-from jhb@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id m9MF0Mv1031616;
	Wed, 22 Oct 2008 15:00:22 GMT (envelope-from jhb@svn.freebsd.org)
Received: (from jhb@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id m9MF0MvH031614;
	Wed, 22 Oct 2008 15:00:22 GMT (envelope-from jhb@svn.freebsd.org)
Message-Id: <200810221500.m9MF0MvH031614@svn.freebsd.org>
From: John Baldwin <jhb@FreeBSD.org>
Date: Wed, 22 Oct 2008 15:00:22 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r184164 - head/sys/dev/ppbus
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/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: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 22 Oct 2008 15:00:22 -0000

Author: jhb
Date: Wed Oct 22 15:00:22 2008
New Revision: 184164
URL: http://svn.freebsd.org/changeset/base/184164

Log:
  Fix build breakage.
  
  Pointy hat:	jhb

Modified:
  head/sys/dev/ppbus/lpt.c
  head/sys/dev/ppbus/ppi.c

Modified: head/sys/dev/ppbus/lpt.c
==============================================================================
--- head/sys/dev/ppbus/lpt.c	Wed Oct 22 14:58:23 2008	(r184163)
+++ head/sys/dev/ppbus/lpt.c	Wed Oct 22 15:00:22 2008	(r184164)
@@ -399,7 +399,7 @@ lpt_attach(device_t dev)
 	sc->cdev_bypass = make_dev(&lpt_cdevsw, unit,
 	    UID_ROOT, GID_WHEEL, 0600, LPT_NAME "%d.ctl", unit);
 	sc->cdev_bypass->si_drv1 = sc;
-	sc->cdev_bypass->si_drv2 = LP_BYPASS;
+	sc->cdev_bypass->si_drv2 = (void *)LP_BYPASS;
 	return (0);
 }
 
@@ -476,7 +476,7 @@ lptopen(struct cdev *dev, int flags, int
 	} else
 		sc->sc_state |= LPTINIT;
 
-	sc->sc_flags = dev->si_drv2;
+	sc->sc_flags = (uintptr_t)dev->si_drv2;
 
 	/* Check for open with BYPASS flag set. */
 	if (sc->sc_flags & LP_BYPASS) {

Modified: head/sys/dev/ppbus/ppi.c
==============================================================================
--- head/sys/dev/ppbus/ppi.c	Wed Oct 22 14:58:23 2008	(r184163)
+++ head/sys/dev/ppbus/ppi.c	Wed Oct 22 15:00:22 2008	(r184164)
@@ -171,7 +171,7 @@ ppi_attach(device_t dev)
 		 UID_ROOT, GID_WHEEL,
 		 0600, "ppi%d", device_get_unit(dev));
 	if (ppi->ppi_cdev == NULL) {
-		device_printf("Failed to create character device\n");
+		device_printf(dev, "Failed to create character device\n");
 		return (ENXIO);
 	}
 	ppi->ppi_cdev->si_drv1 = ppi;
@@ -496,6 +496,7 @@ ppiioctl(struct cdev *dev, u_long cmd, c
 {
 	struct ppi_data *ppi = dev->si_drv1;
 	device_t ppidev = ppi->ppi_device;
+	device_t ppbus = device_get_parent(ppidev);
 	int error = 0;
 	u_int8_t *val = (u_int8_t *)data;