diff options
| author | Mauro Carvalho Chehab <mchehab@redhat.com> | 2008-10-18 20:28:37 -0700 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2008-10-18 20:28:37 -0700 |
| commit | aa3a71395ad7559f94391984b4c1fd15540cc84e (patch) | |
| tree | 9be76e792f2681a71edd6b98a648d5eb559f45fc /linux/drivers/media | |
| parent | 50002dfa8016241804a2e3b31a4605b5fe162d96 (diff) | |
| download | mediapointer-dvb-s2-aa3a71395ad7559f94391984b4c1fd15540cc84e.tar.gz mediapointer-dvb-s2-aa3a71395ad7559f94391984b4c1fd15540cc84e.tar.bz2 | |
backport commit 1a651a00e20fd4997f0b91258f6f95b7d96edcd9
From: Mauro Carvalho Chehab <mchehab@redhat.com>
Author: Harvey Harrison <harvey.harrison@gmail.com>
byteorder: remove direct includes of linux/byteorder/swab[b].h
A consolidated implementation will provide this generically through
asm/byteorder, remove direct includes to avoid breakage when the
changeover to the new implementation occurs.
kernel-sync:
Priority: normal
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'linux/drivers/media')
| -rw-r--r-- | linux/drivers/media/dvb/ttpci/av7110.c | 5 | ||||
| -rw-r--r-- | linux/drivers/media/video/cx18/cx18-driver.h | 1 | ||||
| -rw-r--r-- | linux/drivers/media/video/ivtv/ivtv-driver.h | 1 |
3 files changed, 6 insertions, 1 deletions
diff --git a/linux/drivers/media/dvb/ttpci/av7110.c b/linux/drivers/media/dvb/ttpci/av7110.c index bb63e2121..2ef9f030f 100644 --- a/linux/drivers/media/dvb/ttpci/av7110.c +++ b/linux/drivers/media/dvb/ttpci/av7110.c @@ -36,7 +36,6 @@ #include <linux/fs.h> #include <linux/timer.h> #include <linux/poll.h> -#include <linux/byteorder/swabb.h> #include <linux/smp_lock.h> #include <linux/kernel.h> @@ -52,6 +51,10 @@ #include <linux/i2c.h> #include <linux/kthread.h> #include <asm/unaligned.h> +#include <asm/byteorder.h> +#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 27) +#include <linux/byteorder/swabb.h> +#endif #include <asm/system.h> diff --git a/linux/drivers/media/video/cx18/cx18-driver.h b/linux/drivers/media/video/cx18/cx18-driver.h index fa8be0731..a4b1708fa 100644 --- a/linux/drivers/media/video/cx18/cx18-driver.h +++ b/linux/drivers/media/video/cx18/cx18-driver.h @@ -41,6 +41,7 @@ #include <linux/pagemap.h> #include <linux/workqueue.h> #include <linux/mutex.h> +#include <asm/byteorder.h> #include <linux/dvb/video.h> #include <linux/dvb/audio.h> diff --git a/linux/drivers/media/video/ivtv/ivtv-driver.h b/linux/drivers/media/video/ivtv/ivtv-driver.h index 5c401fae5..9128df0f3 100644 --- a/linux/drivers/media/video/ivtv/ivtv-driver.h +++ b/linux/drivers/media/video/ivtv/ivtv-driver.h @@ -55,6 +55,7 @@ #include <linux/mutex.h> #include <asm/uaccess.h> #include <asm/system.h> +#include <asm/byteorder.h> #include "compat.h" #include <linux/dvb/video.h> |