diff options
| author | Mauro Carvalho Chehab <mchehab+huawei@kernel.org> | 2021-06-01 12:31:30 +0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab+huawei@kernel.org> | 2021-06-04 09:07:30 +0300 |
| commit | 819fbd3d8ef36c09576c2a0ffea503f5c46e9177 (patch) | |
| tree | 2f3fbd35879548967844e75345b0a6454479c266 | |
| parent | cd40407a8a018d43fdb05c84a76af96f8bce9ac2 (diff) | |
| download | linux-819fbd3d8ef36c09576c2a0ffea503f5c46e9177.tar.xz | |
media: dvb header files: move some headers to staging
The audio, video and OSD APIs are used upstream only by the
av7110 driver, which was moved to staging.
So, move the corresponding header files to it.
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
| -rw-r--r-- | drivers/staging/media/av7110/audio.h (renamed from include/uapi/linux/dvb/audio.h) | 0 | ||||
| -rw-r--r-- | drivers/staging/media/av7110/av7110.h | 7 | ||||
| -rw-r--r-- | drivers/staging/media/av7110/osd.h (renamed from include/uapi/linux/dvb/osd.h) | 0 | ||||
| -rw-r--r-- | drivers/staging/media/av7110/video.h (renamed from include/uapi/linux/dvb/video.h) | 0 |
4 files changed, 4 insertions, 3 deletions
diff --git a/include/uapi/linux/dvb/audio.h b/drivers/staging/media/av7110/audio.h index 2f869da69171..2f869da69171 100644 --- a/include/uapi/linux/dvb/audio.h +++ b/drivers/staging/media/av7110/audio.h diff --git a/drivers/staging/media/av7110/av7110.h b/drivers/staging/media/av7110/av7110.h index 809d938ae166..b8e8fc8ddbe9 100644 --- a/drivers/staging/media/av7110/av7110.h +++ b/drivers/staging/media/av7110/av7110.h @@ -9,11 +9,12 @@ #include <linux/input.h> #include <linux/time.h> -#include <linux/dvb/video.h> -#include <linux/dvb/audio.h> +#include "video.h" +#include "audio.h" +#include "osd.h" + #include <linux/dvb/dmx.h> #include <linux/dvb/ca.h> -#include <linux/dvb/osd.h> #include <linux/dvb/net.h> #include <linux/mutex.h> diff --git a/include/uapi/linux/dvb/osd.h b/drivers/staging/media/av7110/osd.h index 858997c74043..858997c74043 100644 --- a/include/uapi/linux/dvb/osd.h +++ b/drivers/staging/media/av7110/osd.h diff --git a/include/uapi/linux/dvb/video.h b/drivers/staging/media/av7110/video.h index 179f1ec60af6..179f1ec60af6 100644 --- a/include/uapi/linux/dvb/video.h +++ b/drivers/staging/media/av7110/video.h |