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 <[email protected]>
---
.../linux/dvb => drivers/staging/media/av7110}/audio.h | 0
drivers/staging/media/av7110/av7110.h | 7 ++++---
.../uapi/linux/dvb => drivers/staging/media/av7110}/osd.h | 0
.../linux/dvb => drivers/staging/media/av7110}/video.h | 0
4 files changed, 4 insertions(+), 3 deletions(-)
rename {include/uapi/linux/dvb => drivers/staging/media/av7110}/audio.h (100%)
rename {include/uapi/linux/dvb => drivers/staging/media/av7110}/osd.h (100%)
rename {include/uapi/linux/dvb => drivers/staging/media/av7110}/video.h (100%)
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 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
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
--
2.31.1