diff options
| author | ed <ed@FreeBSD.org> | 2008-07-24 09:54:10 +0000 |
|---|---|---|
| committer | ed <ed@FreeBSD.org> | 2008-07-24 09:54:10 +0000 |
| commit | 308672b0059651d854c35e673c94d0f76d84c25f (patch) | |
| tree | c85f98b931021ee3e7006f737923b58dba825383 /sys/dev | |
| parent | 6b178cd86d1b89e0750a8253263480cab5f10928 (diff) | |
| download | FreeBSD-src-308672b0059651d854c35e673c94d0f76d84c25f.zip FreeBSD-src-308672b0059651d854c35e673c94d0f76d84c25f.tar.gz | |
Don't include <sys/tty.h> in non-TTY drivers.
The kbd, kbdmux, ugen and uhid drivers included <sys/tty.h>, because
they needed clists, which have been moved to <sys/clist.h> some time
ago. In the MPSAFE TTY branch, <sys/tty.h> does not include
<sys/clist.h>, which means we have to teach these drivers to include
this header file directly.
Approved by: philip (mentor, implicit)
Diffstat (limited to 'sys/dev')
| -rw-r--r-- | sys/dev/kbd/kbd.c | 3 | ||||
| -rw-r--r-- | sys/dev/kbdmux/kbdmux.c | 2 | ||||
| -rw-r--r-- | sys/dev/usb/ugen.c | 2 | ||||
| -rw-r--r-- | sys/dev/usb/uhid.c | 3 |
4 files changed, 6 insertions, 4 deletions
diff --git a/sys/dev/kbd/kbd.c b/sys/dev/kbd/kbd.c index 15a3e22..53b118d 100644 --- a/sys/dev/kbd/kbd.c +++ b/sys/dev/kbd/kbd.c @@ -34,12 +34,13 @@ __FBSDID("$FreeBSD$"); #include <sys/systm.h> #include <sys/kernel.h> #include <sys/malloc.h> +#include <sys/clist.h> #include <sys/conf.h> #include <sys/fcntl.h> -#include <sys/tty.h> #include <sys/poll.h> #include <sys/priv.h> #include <sys/proc.h> +#include <sys/selinfo.h> #include <sys/sysctl.h> #include <sys/uio.h> diff --git a/sys/dev/kbdmux/kbdmux.c b/sys/dev/kbdmux/kbdmux.c index 7be9858..3ece059 100644 --- a/sys/dev/kbdmux/kbdmux.c +++ b/sys/dev/kbdmux/kbdmux.c @@ -36,6 +36,7 @@ #include <sys/param.h> #include <sys/bus.h> +#include <sys/clist.h> #include <sys/conf.h> #include <sys/consio.h> #include <sys/fcntl.h> @@ -52,7 +53,6 @@ #include <sys/selinfo.h> #include <sys/systm.h> #include <sys/taskqueue.h> -#include <sys/tty.h> #include <sys/uio.h> #include <dev/kbd/kbdreg.h> #include <dev/kbd/kbdtables.h> diff --git a/sys/dev/usb/ugen.c b/sys/dev/usb/ugen.c index a63422f..4856919 100644 --- a/sys/dev/usb/ugen.c +++ b/sys/dev/usb/ugen.c @@ -50,6 +50,7 @@ __FBSDID("$FreeBSD$"); #include <sys/param.h> #include <sys/systm.h> +#include <sys/clist.h> #include <sys/kernel.h> #include <sys/malloc.h> #include <sys/module.h> @@ -58,7 +59,6 @@ __FBSDID("$FreeBSD$"); #include <sys/conf.h> #include <sys/fcntl.h> #include <sys/filio.h> -#include <sys/tty.h> #include <sys/file.h> #include <sys/selinfo.h> #include <sys/poll.h> diff --git a/sys/dev/usb/uhid.c b/sys/dev/usb/uhid.c index 2a33cb3..44e8349 100644 --- a/sys/dev/usb/uhid.c +++ b/sys/dev/usb/uhid.c @@ -55,6 +55,7 @@ __FBSDID("$FreeBSD$"); #include <sys/param.h> #include <sys/systm.h> +#include <sys/clist.h> #include <sys/kernel.h> #include <sys/lock.h> #include <sys/malloc.h> @@ -67,11 +68,11 @@ __FBSDID("$FreeBSD$"); #include <sys/bus.h> #include <sys/ioccom.h> #include <sys/conf.h> -#include <sys/tty.h> #include <sys/selinfo.h> #include <sys/proc.h> #include <sys/poll.h> #include <sys/sysctl.h> +#include <sys/ttycom.h> #include <sys/uio.h> #include <dev/usb/usb.h> |
