diff options
| -rw-r--r-- | sys/dev/bktr/bktr_audio.c | 4 | ||||
| -rw-r--r-- | sys/dev/bktr/bktr_card.c | 4 | ||||
| -rw-r--r-- | sys/dev/bktr/bktr_core.c | 4 | ||||
| -rw-r--r-- | sys/dev/bktr/bktr_i2c.c | 13 | ||||
| -rw-r--r-- | sys/dev/bktr/bktr_os.c | 4 | ||||
| -rw-r--r-- | sys/dev/bktr/bktr_tuner.c | 4 | ||||
| -rw-r--r-- | sys/dev/bktr/msp34xx.c | 4 |
7 files changed, 18 insertions, 19 deletions
diff --git a/sys/dev/bktr/bktr_audio.c b/sys/dev/bktr/bktr_audio.c index a23dce3..68bf40b 100644 --- a/sys/dev/bktr/bktr_audio.c +++ b/sys/dev/bktr/bktr_audio.c @@ -80,8 +80,8 @@ __FBSDID("$FreeBSD$"); #include <dev/pci/bktr/bktr_card.h> #include <dev/pci/bktr/bktr_audio.h> #else -#include <machine/ioctl_meteor.h> /* Traditional location of .h files */ -#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_core.h> #include <dev/bktr/bktr_tuner.h> diff --git a/sys/dev/bktr/bktr_card.c b/sys/dev/bktr/bktr_card.c index 337d952..7b769ee 100644 --- a/sys/dev/bktr/bktr_card.c +++ b/sys/dev/bktr/bktr_card.c @@ -77,8 +77,8 @@ __FBSDID("$FreeBSD$"); #include <dev/pci/bktr/bktr_card.h> #include <dev/pci/bktr/bktr_audio.h> #else -#include <machine/ioctl_meteor.h> /* Traditional location for .h files */ -#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_core.h> #include <dev/bktr/bktr_tuner.h> diff --git a/sys/dev/bktr/bktr_core.c b/sys/dev/bktr/bktr_core.c index 3297263..e1b09a6 100644 --- a/sys/dev/bktr/bktr_core.c +++ b/sys/dev/bktr/bktr_core.c @@ -138,8 +138,8 @@ __FBSDID("$FreeBSD$"); #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_tuner.h> #include <dev/bktr/bktr_card.h> 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> diff --git a/sys/dev/bktr/bktr_os.c b/sys/dev/bktr/bktr_os.c index ae32523..312f94c 100644 --- a/sys/dev/bktr/bktr_os.c +++ b/sys/dev/bktr/bktr_os.c @@ -185,8 +185,8 @@ int bktr_debug = 0; #include <dev/pci/bktr/bktr_core.h> #include <dev/pci/bktr/bktr_os.h> #else /* Traditional location for .h files */ -#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_tuner.h> #include <dev/bktr/bktr_card.h> diff --git a/sys/dev/bktr/bktr_tuner.c b/sys/dev/bktr/bktr_tuner.c index 0e86550..66f8625 100644 --- a/sys/dev/bktr/bktr_tuner.c +++ b/sys/dev/bktr/bktr_tuner.c @@ -73,8 +73,8 @@ __FBSDID("$FreeBSD$"); #include <dev/pci/bktr/bktr_card.h> #include <dev/pci/bktr/bktr_core.h> #else -#include <machine/ioctl_meteor.h> /* Traditional .h file location */ -#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_tuner.h> #include <dev/bktr/bktr_card.h> diff --git a/sys/dev/bktr/msp34xx.c b/sys/dev/bktr/msp34xx.c index b6e14e8..6e61fbf 100644 --- a/sys/dev/bktr/msp34xx.c +++ b/sys/dev/bktr/msp34xx.c @@ -87,8 +87,8 @@ #include <machine/bus.h> /* required by bktr_reg.h */ -#include <machine/ioctl_meteor.h> -#include <machine/ioctl_bt848.h> /* extensions to ioctl_meteor.h */ +#include <dev/btkr/ioctl_meteor.h> +#include <dev/btkr/ioctl_bt848.h> /* extensions to ioctl_meteor.h */ #include <dev/bktr/bktr_reg.h> #include <dev/bktr/bktr_tuner.h> #include <dev/bktr/bktr_audio.h> |
