Module Name: src
Committed By: macallan
Date: Wed Jun 3 16:25:22 UTC 2009
Modified Files:
src/sys/dev/sbus: p9100.c
Log Message:
make this compile again without tctrl
To generate a diff of this commit:
cvs rdiff -u -r1.45 -r1.46 src/sys/dev/sbus/p9100.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/sbus/p9100.c
diff -u src/sys/dev/sbus/p9100.c:1.45 src/sys/dev/sbus/p9100.c:1.46
--- src/sys/dev/sbus/p9100.c:1.45 Wed May 27 15:13:22 2009
+++ src/sys/dev/sbus/p9100.c Wed Jun 3 16:25:22 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: p9100.c,v 1.45 2009/05/27 15:13:22 macallan Exp $ */
+/* $NetBSD: p9100.c,v 1.46 2009/06/03 16:25:22 macallan Exp $ */
/*-
* Copyright (c) 1998, 2005, 2006 The NetBSD Foundation, Inc.
@@ -38,7 +38,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: p9100.c,v 1.45 2009/05/27 15:13:22 macallan Exp $");
+__KERNEL_RCSID(0, "$NetBSD: p9100.c,v 1.46 2009/06/03 16:25:22 macallan Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -190,9 +190,7 @@
static void p9100_ramdac_write(struct p9100_softc *, bus_size_t, uint8_t);
static uint8_t p9100_ramdac_read_ctl(struct p9100_softc *, int);
-#if NTCTRL > 0
static void p9100_ramdac_write_ctl(struct p9100_softc *, int, uint8_t);
-#endif
static void p9100_init_engine(struct p9100_softc *);
static int p9100_set_depth(struct p9100_softc *, int);
@@ -869,7 +867,6 @@
return p9100_ramdac_read(sc, DAC_INDX_DATA);
}
-#if NTCTRL > 0
static void
p9100_ramdac_write_ctl(struct p9100_softc *sc, int off, uint8_t val)
{
@@ -877,7 +874,6 @@
p9100_ramdac_write(sc, DAC_INDX_HI, (off & 0xff00) >> 8);
p9100_ramdac_write(sc, DAC_INDX_DATA, val);
}
-#endif /* NTCTRL > 0 */
/*
* Undo the effect of an FBIOSVIDEO that turns the video off.
