Module Name: src
Committed By: tsutsui
Date: Sat May 21 12:02:55 UTC 2011
Modified Files:
src/sys/dev/ic: sti.c
Log Message:
Add a kludge to make this build on hp300.
(anyway bus independent driver should not include bus dependent sti_pci.h)
To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 src/sys/dev/ic/sti.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/ic/sti.c
diff -u src/sys/dev/ic/sti.c:1.14 src/sys/dev/ic/sti.c:1.15
--- src/sys/dev/ic/sti.c:1.14 Wed Nov 24 19:12:08 2010
+++ src/sys/dev/ic/sti.c Sat May 21 12:02:55 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: sti.c,v 1.14 2010/11/24 19:12:08 skrll Exp $ */
+/* $NetBSD: sti.c,v 1.15 2011/05/21 12:02:55 tsutsui Exp $ */
/* $OpenBSD: sti.c,v 1.61 2009/09/05 14:09:35 miod Exp $ */
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sti.c,v 1.14 2010/11/24 19:12:08 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sti.c,v 1.15 2011/05/21 12:02:55 tsutsui Exp $");
#include "wsdisplay.h"
@@ -54,7 +54,9 @@
#include <dev/ic/stireg.h>
#include <dev/ic/stivar.h>
+#ifndef hp300 /* XXX */
#include "sti_pci.h"
+#endif
#ifdef STIDEBUG