From owner-p4-projects  Mon Dec 23 20: 6:27 2002
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 2F17F37B405; Mon, 23 Dec 2002 20:06:25 -0800 (PST)
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id D309137B401
	for <perforce@freebsd.org>; Mon, 23 Dec 2002 20:06:24 -0800 (PST)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 8CB1443EE8
	for <perforce@freebsd.org>; Mon, 23 Dec 2002 20:06:24 -0800 (PST)
	(envelope-from marcel@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id gBO46Ofh013056
	for <perforce@freebsd.org>; Mon, 23 Dec 2002 20:06:24 -0800 (PST)
	(envelope-from marcel@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.6/8.12.6/Submit) id gBO46OXh013053
	for perforce@freebsd.org; Mon, 23 Dec 2002 20:06:24 -0800 (PST)
Date: Mon, 23 Dec 2002 20:06:24 -0800 (PST)
Message-Id: <200212240406.gBO46OXh013053@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f
From: Marcel Moolenaar <marcel@FreeBSD.org>
Subject: PERFORCE change 22687 for review
To: Perforce Change Reviews <perforce@freebsd.org>
Sender: owner-p4-projects@FreeBSD.ORG
Precedence: bulk
List-ID: <p4-projects.FreeBSD.ORG>
List-Archive: <http://docs.freebsd.org/mail/> (Web Archive)
List-Help: <mailto:majordomo@FreeBSD.ORG?subject=help> (List Instructions)
List-Subscribe: <mailto:majordomo@FreeBSD.ORG?subject=subscribe%20p4-projects>
List-Unsubscribe: <mailto:majordomo@FreeBSD.ORG?subject=unsubscribe%20p4-projects>
X-Loop: FreeBSD.ORG

http://perforce.freebsd.org/chv.cgi?CH=22687

Change 22687 by marcel@marcel_nfs on 2002/12/23 20:05:55

	Make this compile on i386:
	o  ACPI is loaded as a module by default. Therefore, do not
	   make the ACPI bus driver optional.
	o  Include opt_isa.h for the definition of DEV_ISA. 

Affected files ...

.. //depot/projects/ia64/sys/dev/sio/sio_isa.c#12 edit

Differences ...

==== //depot/projects/ia64/sys/dev/sio/sio_isa.c#12 (text+ko) ====

@@ -24,7 +24,7 @@
  * $FreeBSD: src/sys/dev/sio/sio_isa.c,v 1.9 2002/05/06 09:02:55 dwmalone Exp $
  */
 
-#include "opt_acpi.h"
+#include "opt_isa.h"
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -202,9 +202,7 @@
 	return (error);
 }
 
+DRIVER_MODULE(sio, acpi, sio_isa_driver, sio_devclass, 0, 0);
 #ifdef DEV_ISA
 DRIVER_MODULE(sio, isa, sio_isa_driver, sio_devclass, 0, 0);
 #endif
-#ifdef DEV_ACPI
-DRIVER_MODULE(sio, acpi, sio_isa_driver, sio_devclass, 0, 0);
-#endif

To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe p4-projects" in the body of the message