Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/dev/ic For converge with FreeBSD:



details:   https://anonhg.NetBSD.org/src/rev/d5c841d98d56
branches:  trunk
changeset: 547101:d5c841d98d56
user:      dyoung <dyoung%NetBSD.org@localhost>
date:      Tue May 13 07:17:46 2003 +0000

description:
For converge with FreeBSD:

diffstat:

 sys/dev/ic/wi.c |  6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diffs (34 lines):

diff -r 41209eecfe5b -r d5c841d98d56 sys/dev/ic/wi.c
--- a/sys/dev/ic/wi.c   Tue May 13 07:13:49 2003 +0000
+++ b/sys/dev/ic/wi.c   Tue May 13 07:17:46 2003 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: wi.c,v 1.121 2003/05/13 07:13:49 dyoung Exp $  */
+/*     $NetBSD: wi.c,v 1.122 2003/05/13 07:17:46 dyoung Exp $  */
 
 /*
  * Copyright (c) 1997, 1998, 1999
@@ -70,7 +70,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: wi.c,v 1.121 2003/05/13 07:13:49 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: wi.c,v 1.122 2003/05/13 07:17:46 dyoung Exp $");
 
 #define WI_HERMES_AUTOINC_WAR  /* Work around data write autoinc bug. */
 #define WI_HERMES_STATS_WAR    /* Work around stats counter bug. */
@@ -428,6 +428,7 @@
        return 0;
 }
 
+#ifdef __NetBSD__
 int
 wi_activate(struct device *self, enum devact act)
 {
@@ -473,6 +474,7 @@
        }
        splx(s);
 }
+#endif /* __NetBSD__ */
 
 void
 wi_shutdown(struct wi_softc *sc)



Home | Main Index | Thread Index | Old Index