Mon Jun 12 08:19:22 2017 UTC ()
There is no longer a NWSBELL (since nothing depends on it), so there's no
need to #include wsbell.h (which is where it used to be defined, as a
result of a needs-flag in files.wscons).

Remove the #include


(pgoyette)
diff -r1.62 -r1.63 src/sys/dev/wscons/wsmux.c
cvs diff -r1.62 -r1.63 src/sys/dev/wscons/wsmux.c (expand / switch to unified diff)

--- src/sys/dev/wscons/wsmux.c 2017/06/11 03:55:56 1.62
+++ src/sys/dev/wscons/wsmux.c 2017/06/12 08:19:22 1.63
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1/* $NetBSD: wsmux.c,v 1.62 2017/06/11 03:55:56 nat Exp $ */ 1/* $NetBSD: wsmux.c,v 1.63 2017/06/12 08:19:22 pgoyette Exp $ */
2 2
3/* 3/*
4 * Copyright (c) 1998, 2005 The NetBSD Foundation, Inc. 4 * Copyright (c) 1998, 2005 The NetBSD Foundation, Inc.
5 * All rights reserved. 5 * All rights reserved.
6 * 6 *
7 * Author: Lennart Augustsson <lennart@augustsson.net> 7 * Author: Lennart Augustsson <lennart@augustsson.net>
8 * Carlstedt Research & Technology 8 * Carlstedt Research & Technology
9 * 9 *
10 * Redistribution and use in source and binary forms, with or without 10 * Redistribution and use in source and binary forms, with or without
11 * modification, are permitted provided that the following conditions 11 * modification, are permitted provided that the following conditions
12 * are met: 12 * are met:
13 * 1. Redistributions of source code must retain the above copyright 13 * 1. Redistributions of source code must retain the above copyright
14 * notice, this list of conditions and the following disclaimer. 14 * notice, this list of conditions and the following disclaimer.
@@ -27,38 +27,37 @@ @@ -27,38 +27,37 @@
27 * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) 27 * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
28 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE 28 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
29 * POSSIBILITY OF SUCH DAMAGE. 29 * POSSIBILITY OF SUCH DAMAGE.
30 */ 30 */
31 31
32/* 32/*
33 * wscons mux device. 33 * wscons mux device.
34 * 34 *
35 * The mux device is a collection of real mice and keyboards and acts as 35 * The mux device is a collection of real mice and keyboards and acts as
36 * a merge point for all the events from the different real devices. 36 * a merge point for all the events from the different real devices.
37 */ 37 */
38 38
39#include <sys/cdefs.h> 39#include <sys/cdefs.h>
40__KERNEL_RCSID(0, "$NetBSD: wsmux.c,v 1.62 2017/06/11 03:55:56 nat Exp $"); 40__KERNEL_RCSID(0, "$NetBSD: wsmux.c,v 1.63 2017/06/12 08:19:22 pgoyette Exp $");
41 41
42#ifdef _KERNEL_OPT 42#ifdef _KERNEL_OPT
43#include "opt_compat_netbsd.h" 43#include "opt_compat_netbsd.h"
44#include "opt_modular.h" 44#include "opt_modular.h"
45#endif 45#endif
46 46
47#include "wsdisplay.h" 47#include "wsdisplay.h"
48#include "wsmux.h" 48#include "wsmux.h"
49#include "wskbd.h" 49#include "wskbd.h"
50#include "wsmouse.h" 50#include "wsmouse.h"
51#include "wsbell.h" 
52 51
53#include <sys/param.h> 52#include <sys/param.h>
54#include <sys/conf.h> 53#include <sys/conf.h>
55#include <sys/ioctl.h> 54#include <sys/ioctl.h>
56#include <sys/poll.h> 55#include <sys/poll.h>
57#include <sys/fcntl.h> 56#include <sys/fcntl.h>
58#include <sys/kernel.h> 57#include <sys/kernel.h>
59#include <sys/malloc.h> 58#include <sys/malloc.h>
60#include <sys/proc.h> 59#include <sys/proc.h>
61#include <sys/queue.h> 60#include <sys/queue.h>
62#include <sys/syslog.h> 61#include <sys/syslog.h>
63#include <sys/systm.h> 62#include <sys/systm.h>
64#include <sys/tty.h> 63#include <sys/tty.h>