From: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
Date: Tue, 1 Jun 2021 09:31:30 +0000 (+0200)
Subject: media: dvb header files: move some headers to staging
X-Git-Tag: v5.14-rc1~165^2~129
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=819fbd3d8ef36c09576c2a0ffea503f5c46e9177;p=thirdparty%2Flinux.git

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>
---

diff --git a/include/uapi/linux/dvb/audio.h b/drivers/staging/media/av7110/audio.h
similarity index 100%
rename from include/uapi/linux/dvb/audio.h
rename to drivers/staging/media/av7110/audio.h
diff --git a/drivers/staging/media/av7110/av7110.h b/drivers/staging/media/av7110/av7110.h
index 809d938ae1667..b8e8fc8ddbe9c 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
similarity index 100%
rename from include/uapi/linux/dvb/osd.h
rename to drivers/staging/media/av7110/osd.h
diff --git a/include/uapi/linux/dvb/video.h b/drivers/staging/media/av7110/video.h
similarity index 100%
rename from include/uapi/linux/dvb/video.h
rename to drivers/staging/media/av7110/video.h