From owner-freebsd-current@FreeBSD.ORG  Sun Jun 19 00:21:34 2005
Return-Path: <owner-freebsd-current@FreeBSD.ORG>
X-Original-To: freebsd-current@freebsd.org
Delivered-To: freebsd-current@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id BFFCA16A41C
	for <freebsd-current@freebsd.org>; Sun, 19 Jun 2005 00:21:34 +0000 (GMT)
	(envelope-from raj@cserv62.csub.edu)
Received: from cserv62.csub.edu (cserv62.csub.edu [136.168.10.62])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 9EC5943D1D
	for <freebsd-current@freebsd.org>; Sun, 19 Jun 2005 00:21:34 +0000 (GMT)
	(envelope-from raj@cserv62.csub.edu)
Received: from eru.homelan (adsl-66-126-39-251.dsl.anhm01.pacbell.net
	[66.126.39.251])
	by cserv62.csub.edu (8.13.3/8.13.1) with ESMTP id j5J0HZXo092264
	for <freebsd-current@freebsd.org>; Sat, 18 Jun 2005 17:17:35 -0700 (PDT)
	(envelope-from raj@cserv62.csub.edu)
Received: (from raj@localhost)
	by eru.homelan (8.13.4/8.13.4/Submit) id j5J0LVLx032128
	for freebsd-current@freebsd.org; Sat, 18 Jun 2005 17:21:31 -0700 (PDT)
	(envelope-from raj)
Date: Sat, 18 Jun 2005 17:21:31 -0700
From: Russell Jackson <raj@cserv62.csub.edu>
To: freebsd-current@freebsd.org
Message-ID: <20050619002131.GA29495@eru.homelan>
References: <20050618013902.GA756@localhost.homelan>
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <20050618013902.GA756@localhost.homelan>
User-Agent: Mutt/1.5.9i
Subject: Re: nvidia-driver and bus_memio.h
X-BeenThere: freebsd-current@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Discussions about the use of FreeBSD-current
	<freebsd-current.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-current>, 
	<mailto:freebsd-current-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-current>
List-Post: <mailto:freebsd-current@freebsd.org>
List-Help: <mailto:freebsd-current-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-current>,
	<mailto:freebsd-current-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 19 Jun 2005 00:21:34 -0000

Trivial fix:

--- src/nv-freebsd.h.bak	Sat Jun 18 17:12:48 2005
+++ src/nv-freebsd.h		Sat Jun 18 17:19:25 2005
@@ -43,7 +43,6 @@
 #include <machine/clock.h>
 #include <machine/stdarg.h>
 #include <machine/bus.h>
-#include <machine/bus_memio.h>
 #include <machine/vm86.h>
 
 #include <sys/conf.h>
@@ -180,7 +179,7 @@
  * thus disabled by default (this is 5.x/-CURRENT only).
  */
 
-#undef NV_SUPPORT_ACPI_PM
+#define NV_SUPPORT_ACPI_PM
 
 
 /*

On Fri, Jun 17, 2005 at 06:39:02PM -0700, Russell Jackson wrote:
> The removal of bus_memio.h broke the nvidia driver.
> 
> -- 
> Russell A. Jackson
> Rudin's Law:
> 	If there is a wrong way to do something, most people will
> 	do it every time.
> 
> Rudin's Second Law:
> 	In a crisis that forces a choice to be made among alternative
> 	courses of action, people tend to choose the worst possible
> 	course.
> _______________________________________________
> freebsd-current@freebsd.org mailing list
> http://lists.freebsd.org/mailman/listinfo/freebsd-current
> To unsubscribe, send any mail to "freebsd-current-unsubscribe@freebsd.org"

-- 
Russell A. Jackson <raj@csub.edu>
	A man walked into a bar with his alligator and asked the bartender,
"Do you serve lawyers here?".
	"Sure do," replied the bartender.
	"Good," said the man.  "Give me a beer, and I'll have a lawyer for
my 'gator."