From owner-svn-src-stable@FreeBSD.ORG  Fri Nov 19 20:23:01 2010
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 A2A5A1065674;
	Fri, 19 Nov 2010 20:23:01 +0000 (UTC)
	(envelope-from attilio@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 91EA18FC13;
	Fri, 19 Nov 2010 20:23:01 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id oAJKN1Qf088271;
	Fri, 19 Nov 2010 20:23:01 GMT (envelope-from attilio@svn.freebsd.org)
Received: (from attilio@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id oAJKN1LZ088269;
	Fri, 19 Nov 2010 20:23:01 GMT (envelope-from attilio@svn.freebsd.org)
Message-Id: <201011192023.oAJKN1LZ088269@svn.freebsd.org>
From: Attilio Rao <attilio@FreeBSD.org>
Date: Fri, 19 Nov 2010 20:23:01 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org
X-SVN-Group: stable-8
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r215545 - stable/8/sys/x86/x86
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: Fri, 19 Nov 2010 20:23:01 -0000

Author: attilio
Date: Fri Nov 19 20:23:01 2010
New Revision: 215545
URL: http://svn.freebsd.org/changeset/base/215545

Log:
  Fix-up r215539 by specifying correctly the ISA headers are they are not
  shared on STABLE_8.
  
  Reported by:	kib

Modified:
  stable/8/sys/x86/x86/nexus.c

Modified: stable/8/sys/x86/x86/nexus.c
==============================================================================
--- stable/8/sys/x86/x86/nexus.c	Fri Nov 19 19:43:56 2010	(r215544)
+++ stable/8/sys/x86/x86/nexus.c	Fri Nov 19 20:23:01 2010	(r215545)
@@ -76,10 +76,12 @@ __FBSDID("$FreeBSD$");
 
 #ifdef DEV_ISA
 #include <isa/isavar.h>
-#ifdef PC98
-#include <pc98/cbus/cbus.h>
+#ifdef __amd64__
+#include <amd64/isa/isa.h>
+#elif defined(__i386__)
+#include <i386/isa/isa.h>
 #else
-#include <x86/isa/isa.h>
+#include <pc98/cbus/cbus.h>
 #endif
 #endif
 #include <sys/rtprio.h>