diff options
| author | obrien <obrien@FreeBSD.org> | 2003-12-08 07:59:18 +0000 |
|---|---|---|
| committer | obrien <obrien@FreeBSD.org> | 2003-12-08 07:59:18 +0000 |
| commit | 94d92abf41cf3f8c4953824c165bbb60315c0280 (patch) | |
| tree | aa43223a5db60eeb5f8b8cc9a79abbf459b971e7 /sys/dev/bktr/bktr_i2c.c | |
| parent | 4bb21e1ec337ce29ea16c48f04d2e9304c0caa1a (diff) | |
| download | FreeBSD-src-94d92abf41cf3f8c4953824c165bbb60315c0280.zip FreeBSD-src-94d92abf41cf3f8c4953824c165bbb60315c0280.tar.gz | |
Move the bktr(4) <arch>/include/ioctl_{bt848,meteor}.h files to dev/bktr
as these ioctl's aren't MD. This also means they are installed in
/usr/include/dev/bktr now. Also provide compatability wrappers for
where these headers lived in 4.x.
Diffstat (limited to 'sys/dev/bktr/bktr_i2c.c')
| -rw-r--r-- | sys/dev/bktr/bktr_i2c.c | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/sys/dev/bktr/bktr_i2c.c b/sys/dev/bktr/bktr_i2c.c index acb75ff..1941098 100644 --- a/sys/dev/bktr/bktr_i2c.c +++ b/sys/dev/bktr/bktr_i2c.c @@ -43,10 +43,10 @@ __FBSDID("$FreeBSD$"); #include <sys/bus.h> #include <sys/uio.h> -#if __FreeBSD_version >= 500014 -#include <sys/selinfo.h> -#else +#if __FreeBSD_version < 500014 #include <sys/select.h> +#else +#include <sys/selinfo.h> #endif #if (__FreeBSD_version < 500000) @@ -58,15 +58,14 @@ __FBSDID("$FreeBSD$"); #include <dev/pci/pcireg.h> #endif -#if (__FreeBSD_version >=300000) +#if (__FreeBSD_version >= 300000) #include <machine/bus_memio.h> /* for bus space */ #include <machine/bus.h> #include <sys/bus.h> #endif -#include <machine/ioctl_meteor.h> -#include <machine/ioctl_bt848.h> /* extensions to ioctl_meteor.h */ - +#include <dev/bktr/ioctl_meteor.h> +#include <dev/bktr/ioctl_bt848.h> /* extensions to ioctl_meteor.h */ #include <dev/bktr/bktr_reg.h> #include <dev/bktr/bktr_i2c.h> |
