]> git.ipfire.org Git - thirdparty/linux.git/commitdiff
media: saa7146: deprecate hexium_gemini/orion, mxb and ttpci
authorHans Verkuil <hverkuil-cisco@xs4all.nl>
Thu, 11 Aug 2022 09:17:48 +0000 (11:17 +0200)
committerMauro Carvalho Chehab <mchehab@kernel.org>
Mon, 29 Aug 2022 14:46:38 +0000 (16:46 +0200)
Deprecate the hexium_gemini, hexium_orion, mxb and ttpci saa7146-based
drivers: these drivers do not use the vb2 framework for video streaming,
instead it uses the old videobuf framework.

We want to get rid of these old drivers, so deprecated these for future
removal.

[hverkuil: update MAINTAINERS file]

Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab@kernel.org>
35 files changed:
MAINTAINERS
drivers/media/common/Kconfig
drivers/media/common/Makefile
drivers/media/pci/Kconfig
drivers/media/pci/Makefile
drivers/staging/media/Kconfig
drivers/staging/media/Makefile
drivers/staging/media/av7110/Makefile
drivers/staging/media/av7110/av7110.h
drivers/staging/media/deprecated/saa7146/Kconfig [new file with mode: 0644]
drivers/staging/media/deprecated/saa7146/Makefile [new file with mode: 0644]
drivers/staging/media/deprecated/saa7146/common/Kconfig [moved from drivers/media/common/saa7146/Kconfig with 100% similarity]
drivers/staging/media/deprecated/saa7146/common/Makefile [moved from drivers/media/common/saa7146/Makefile with 100% similarity]
drivers/staging/media/deprecated/saa7146/common/saa7146.h [moved from include/media/drv-intf/saa7146.h with 100% similarity]
drivers/staging/media/deprecated/saa7146/common/saa7146_core.c [moved from drivers/media/common/saa7146/saa7146_core.c with 99% similarity]
drivers/staging/media/deprecated/saa7146/common/saa7146_fops.c [moved from drivers/media/common/saa7146/saa7146_fops.c with 99% similarity]
drivers/staging/media/deprecated/saa7146/common/saa7146_hlp.c [moved from drivers/media/common/saa7146/saa7146_hlp.c with 99% similarity]
drivers/staging/media/deprecated/saa7146/common/saa7146_i2c.c [moved from drivers/media/common/saa7146/saa7146_i2c.c with 99% similarity]
drivers/staging/media/deprecated/saa7146/common/saa7146_vbi.c [moved from drivers/media/common/saa7146/saa7146_vbi.c with 99% similarity]
drivers/staging/media/deprecated/saa7146/common/saa7146_video.c [moved from drivers/media/common/saa7146/saa7146_video.c with 99% similarity]
drivers/staging/media/deprecated/saa7146/common/saa7146_vv.h [moved from include/media/drv-intf/saa7146_vv.h with 99% similarity]
drivers/staging/media/deprecated/saa7146/saa7146/Kconfig [moved from drivers/media/pci/saa7146/Kconfig with 67% similarity]
drivers/staging/media/deprecated/saa7146/saa7146/Makefile [moved from drivers/media/pci/saa7146/Makefile with 100% similarity]
drivers/staging/media/deprecated/saa7146/saa7146/TODO [new file with mode: 0644]
drivers/staging/media/deprecated/saa7146/saa7146/hexium_gemini.c [moved from drivers/media/pci/saa7146/hexium_gemini.c with 99% similarity]
drivers/staging/media/deprecated/saa7146/saa7146/hexium_orion.c [moved from drivers/media/pci/saa7146/hexium_orion.c with 99% similarity]
drivers/staging/media/deprecated/saa7146/saa7146/mxb.c [moved from drivers/media/pci/saa7146/mxb.c with 99% similarity]
drivers/staging/media/deprecated/saa7146/ttpci/Kconfig [moved from drivers/media/pci/ttpci/Kconfig with 83% similarity]
drivers/staging/media/deprecated/saa7146/ttpci/Makefile [moved from drivers/media/pci/ttpci/Makefile with 100% similarity]
drivers/staging/media/deprecated/saa7146/ttpci/TODO [new file with mode: 0644]
drivers/staging/media/deprecated/saa7146/ttpci/budget-av.c [moved from drivers/media/pci/ttpci/budget-av.c with 99% similarity]
drivers/staging/media/deprecated/saa7146/ttpci/budget-ci.c [moved from drivers/media/pci/ttpci/budget-ci.c with 100% similarity]
drivers/staging/media/deprecated/saa7146/ttpci/budget-core.c [moved from drivers/media/pci/ttpci/budget-core.c with 100% similarity]
drivers/staging/media/deprecated/saa7146/ttpci/budget.c [moved from drivers/media/pci/ttpci/budget.c with 100% similarity]
drivers/staging/media/deprecated/saa7146/ttpci/budget.h [moved from drivers/media/pci/ttpci/budget.h with 98% similarity]

index 7f123e4d0f0a43236e30ac5ea616fe61b120eb83..d457299ce736eea3b435766ac78ac71410413170 100644 (file)
@@ -17910,8 +17910,7 @@ M:      Hans Verkuil <hverkuil@xs4all.nl>
 L:     linux-media@vger.kernel.org
 S:     Maintained
 T:     git git://linuxtv.org/media_tree.git
-F:     drivers/media/common/saa7146/
-F:     drivers/media/pci/saa7146/
+F:     drivers/staging/media/deprecated/saa7146/
 F:     include/media/drv-intf/saa7146*
 
 SAFESETID SECURITY MODULE
index a2ae7127005427e7b5d47c0c90d4b69482818359..852b7d92fbdd93c4a99ec88415f9d8a2ca64e517 100644 (file)
@@ -22,7 +22,6 @@ config VIDEO_TVEEPROM
        depends on I2C
 
 source "drivers/media/common/b2c2/Kconfig"
-source "drivers/media/common/saa7146/Kconfig"
 source "drivers/media/common/siano/Kconfig"
 source "drivers/media/common/v4l2-tpg/Kconfig"
 source "drivers/media/common/videobuf2/Kconfig"
index ad0b1e95fb124554eb4a9099c89bb656e6b6d6d0..d78a0df154783a8b8e9de40d0fb248543d3d7628 100644 (file)
@@ -1,5 +1,5 @@
 # SPDX-License-Identifier: GPL-2.0-only
-obj-y += b2c2/ saa7146/ siano/ v4l2-tpg/ videobuf2/
+obj-y += b2c2/ siano/ v4l2-tpg/ videobuf2/
 
 # Please keep it alphabetically sorted by Kconfig name
 # (e. g. LC_ALL=C sort Makefile)
index 480194543d0553f3228586c9fea2694b549bdac9..dff0b450f38758c91d3aa1ce7d68afb9f66de3f2 100644 (file)
@@ -27,7 +27,6 @@ if MEDIA_ANALOG_TV_SUPPORT
 
 source "drivers/media/pci/dt3155/Kconfig"
 source "drivers/media/pci/ivtv/Kconfig"
-source "drivers/media/pci/saa7146/Kconfig"
 
 endif
 
@@ -58,7 +57,6 @@ source "drivers/media/pci/pluto2/Kconfig"
 source "drivers/media/pci/pt1/Kconfig"
 source "drivers/media/pci/pt3/Kconfig"
 source "drivers/media/pci/smipcie/Kconfig"
-source "drivers/media/pci/ttpci/Kconfig"
 
 endif
 
index 8bed619b713060969d1e16451377da296263746d..8f887a8a7f179e4f5d712bacff6b35190cd0b401 100644 (file)
@@ -5,8 +5,7 @@
 
 # Please keep it alphabetically sorted by directory
 # (e. g. LC_ALL=C sort Makefile)
-obj-y        +=        ttpci/          \
-               b2c2/           \
+obj-y        +=        b2c2/           \
                pluto2/         \
                dm1105/         \
                pt1/            \
@@ -14,7 +13,6 @@ obj-y        +=       ttpci/          \
                mantis/         \
                ngene/          \
                ddbridge/       \
-               saa7146/        \
                smipcie/        \
                netup_unidvb/   \
                intel/
index e520241e77232d9a3d1b46944258c679ec969797..d78b8c3f08145359e6038e634ca359b5c9a36285 100644 (file)
@@ -58,6 +58,7 @@ if STAGING_MEDIA_DEPRECATED
 source "drivers/staging/media/deprecated/cpia2/Kconfig"
 source "drivers/staging/media/deprecated/fsl-viu/Kconfig"
 source "drivers/staging/media/deprecated/meye/Kconfig"
+source "drivers/staging/media/deprecated/saa7146/Kconfig"
 source "drivers/staging/media/deprecated/stkwebcam/Kconfig"
 source "drivers/staging/media/deprecated/tm6000/Kconfig"
 source "drivers/staging/media/deprecated/vpfe_capture/Kconfig"
index ad2893d34cb89ec03616d5be619e32df1a8d975e..3aa5e77b62f88edb7aa64fea8c4e0fdfbccae73b 100644 (file)
@@ -17,3 +17,4 @@ obj-$(CONFIG_VIDEO_VIU)               += deprecated/fsl-viu/
 obj-$(CONFIG_USB_ZR364XX)      += deprecated/zr364xx/
 obj-$(CONFIG_DVB_AV7110)       += av7110/
 obj-y += deprecated/vpfe_capture/
+obj-y += deprecated/saa7146/
index 307b267598ea67f5c17408031c21fe3c13370638..c04cd0a59109e37bc9e47de98eb78dbf11a87f0b 100644 (file)
@@ -18,5 +18,6 @@ obj-$(CONFIG_DVB_SP8870) += sp8870.o
 
 ccflags-y += -I $(srctree)/drivers/media/dvb-frontends
 ccflags-y += -I $(srctree)/drivers/media/tuners
-ccflags-y += -I $(srctree)/drivers/media/pci/ttpci
 ccflags-y += -I $(srctree)/drivers/media/common
+ccflags-y += -I $(srctree)/drivers/staging/media/deprecated/saa7146/ttpci
+ccflags-y += -I $(srctree)/drivers/staging/media/deprecated/saa7146/common
index 809d938ae1667f1c4c8fad802cd3592a8697609d..9fde69b38f1ce3a2769c935e4bc5d8bb3d6f521a 100644 (file)
@@ -33,7 +33,7 @@
 #include "stv0297.h"
 #include "l64781.h"
 
-#include <media/drv-intf/saa7146_vv.h>
+#include "saa7146_vv.h"
 
 
 #define ANALOG_TUNER_VES1820 1
diff --git a/drivers/staging/media/deprecated/saa7146/Kconfig b/drivers/staging/media/deprecated/saa7146/Kconfig
new file mode 100644 (file)
index 0000000..d0cb521
--- /dev/null
@@ -0,0 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
+source "drivers/staging/media/deprecated/saa7146/common/Kconfig"
+source "drivers/staging/media/deprecated/saa7146/saa7146/Kconfig"
+source "drivers/staging/media/deprecated/saa7146/ttpci/Kconfig"
diff --git a/drivers/staging/media/deprecated/saa7146/Makefile b/drivers/staging/media/deprecated/saa7146/Makefile
new file mode 100644 (file)
index 0000000..9d99fde
--- /dev/null
@@ -0,0 +1,2 @@
+ # SPDX-License-Identifier: GPL-2.0-only
+obj-y += common/ saa7146/ ttpci/
similarity index 99%
rename from drivers/media/common/saa7146/saa7146_core.c
rename to drivers/staging/media/deprecated/saa7146/common/saa7146_core.c
index e50fa0ff7c5d5486fce4548e9fefa40f532bac6a..da21d346b87005ed9dce63270f1bfd9a91679dea 100644 (file)
@@ -8,8 +8,8 @@
 
 #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
 
-#include <media/drv-intf/saa7146.h>
 #include <linux/module.h>
+#include "saa7146.h"
 
 static int saa7146_num;
 
similarity index 99%
rename from drivers/media/common/saa7146/saa7146_fops.c
rename to drivers/staging/media/deprecated/saa7146/common/saa7146_fops.c
index e9a15de6126e90d117628254dbd2da5c15947706..aa14698a9c54562cd5b78b051dac5bdd3066cac7 100644 (file)
@@ -1,8 +1,8 @@
 // SPDX-License-Identifier: GPL-2.0-only
 #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
 
-#include <media/drv-intf/saa7146_vv.h>
 #include <linux/module.h>
+#include "saa7146_vv.h"
 
 /****************************************************************************/
 /* resource management functions, shamelessly stolen from saa7134 driver */
similarity index 99%
rename from drivers/media/common/saa7146/saa7146_hlp.c
rename to drivers/staging/media/deprecated/saa7146/common/saa7146_hlp.c
index 6c9946a402eefec8d2941119fd127a9b8768388f..b1222a4cfa4a82111e8eb0236fe6fa395b90b0dd 100644 (file)
@@ -3,7 +3,7 @@
 
 #include <linux/kernel.h>
 #include <linux/export.h>
-#include <media/drv-intf/saa7146_vv.h>
+#include "saa7146_vv.h"
 
 static void calculate_output_format_register(struct saa7146_dev* saa, u32 palette, u32* clip_format)
 {
similarity index 99%
rename from drivers/media/common/saa7146/saa7146_i2c.c
rename to drivers/staging/media/deprecated/saa7146/common/saa7146_i2c.c
index df9ebe2a168cb05c24bc32123d108510f79cbad5..7a33fe51775a28b98df4bc60367d3c9fa44cc238 100644 (file)
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: GPL-2.0
 #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
 
-#include <media/drv-intf/saa7146_vv.h>
+#include "saa7146_vv.h"
 
 static u32 saa7146_i2c_func(struct i2c_adapter *adapter)
 {
similarity index 99%
rename from drivers/media/common/saa7146/saa7146_vbi.c
rename to drivers/staging/media/deprecated/saa7146/common/saa7146_vbi.c
index bd442b984423feb1c8dfc6ce25760c642ed08f58..2d4a05d7bc5b8b18999e4bad0d5e8a865c306b18 100644 (file)
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: GPL-2.0
-#include <media/drv-intf/saa7146_vv.h>
+#include "saa7146_vv.h"
 
 static int vbi_pixel_to_capture = 720 * 2;
 
similarity index 99%
rename from drivers/media/common/saa7146/saa7146_video.c
rename to drivers/staging/media/deprecated/saa7146/common/saa7146_video.c
index 2296765079a41d503cf77e94f2a4ded828924147..4598a44231fa8ab9e37621ef3b4d3adf98f06584 100644 (file)
@@ -1,10 +1,10 @@
 #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
 
-#include <media/drv-intf/saa7146_vv.h>
 #include <media/v4l2-event.h>
 #include <media/v4l2-ctrls.h>
 #include <linux/module.h>
 #include <linux/kernel.h>
+#include "saa7146_vv.h"
 
 static int max_memory = 32;
 
similarity index 99%
rename from include/media/drv-intf/saa7146_vv.h
rename to drivers/staging/media/deprecated/saa7146/common/saa7146_vv.h
index 635805fb35e876e754bb02cc17770c8784453d48..d7bd916fe3adb59d523b6d495dc996274b601a58 100644 (file)
@@ -5,8 +5,8 @@
 #include <media/v4l2-common.h>
 #include <media/v4l2-ioctl.h>
 #include <media/v4l2-fh.h>
-#include <media/drv-intf/saa7146.h>
 #include <media/videobuf-dma-sg.h>
+#include "saa7146.h"
 
 #define MAX_SAA7146_CAPTURE_BUFFERS    32      /* arbitrary */
 #define BUFFER_TIMEOUT     (HZ/2)  /* 0.5 seconds */
similarity index 67%
rename from drivers/media/pci/saa7146/Kconfig
rename to drivers/staging/media/deprecated/saa7146/saa7146/Kconfig
index 3bbb68a0ed7bc9d85a8cf29f82aa80b1d5c9a72d..228e8d3f8d2b38a3173577d8385b2651a876c76d 100644 (file)
@@ -1,6 +1,6 @@
 # SPDX-License-Identifier: GPL-2.0-only
 config VIDEO_HEXIUM_GEMINI
-       tristate "Hexium Gemini frame grabber"
+       tristate "Hexium Gemini frame grabber (DEPRECATED)"
        depends on PCI && VIDEO_DEV && I2C
        select VIDEO_SAA7146_VV
        help
@@ -8,22 +8,28 @@ config VIDEO_HEXIUM_GEMINI
          grabber card by Hexium. Please note that the Gemini Dual
          card is *not* fully supported.
 
+         This driver is deprecated and is scheduled for removal by
+         the beginning of 2023. See the TODO file for more information.
+
          To compile this driver as a module, choose M here: the
          module will be called hexium_gemini.
 
 config VIDEO_HEXIUM_ORION
-       tristate "Hexium HV-PCI6 and Orion frame grabber"
+       tristate "Hexium HV-PCI6 and Orion frame grabber (DEPRECATED)"
        depends on PCI && VIDEO_DEV && I2C
        select VIDEO_SAA7146_VV
        help
          This is a video4linux driver for the Hexium HV-PCI6 and
          Orion frame grabber cards by Hexium.
 
+         This driver is deprecated and is scheduled for removal by
+         the beginning of 2023. See the TODO file for more information.
+
          To compile this driver as a module, choose M here: the
          module will be called hexium_orion.
 
 config VIDEO_MXB
-       tristate "Siemens-Nixdorf 'Multimedia eXtension Board'"
+       tristate "Siemens-Nixdorf 'Multimedia eXtension Board' (DEPRECATED)"
        depends on PCI && VIDEO_DEV && I2C
        select VIDEO_SAA7146_VV
        select VIDEO_TUNER
@@ -35,5 +41,8 @@ config VIDEO_MXB
          This is a video4linux driver for the 'Multimedia eXtension Board'
          TV card by Siemens-Nixdorf.
 
+         This driver is deprecated and is scheduled for removal by
+         the beginning of 2023. See the TODO file for more information.
+
          To compile this driver as a module, choose M here: the
          module will be called mxb.
diff --git a/drivers/staging/media/deprecated/saa7146/saa7146/TODO b/drivers/staging/media/deprecated/saa7146/saa7146/TODO
new file mode 100644 (file)
index 0000000..c9ae2ec
--- /dev/null
@@ -0,0 +1,7 @@
+The saa7146-based drivers are one of the few drivers still not using
+the vb2 framework, so these drivers are now deprecated with the intent of
+removing them altogether by the beginning of 2023.
+
+In order to keep these drivers they have to be converted to vb2.
+If someone is interested in doing this work, then contact the
+linux-media mailinglist (https://linuxtv.org/lists.php).
similarity index 99%
rename from drivers/media/pci/saa7146/hexium_gemini.c
rename to drivers/staging/media/deprecated/saa7146/saa7146/hexium_gemini.c
index 3947701cd6c7e76835d3d8e58321a5a75c7d9c46..124e82bd45079b0415aade24b1f598c9c8159be1 100644 (file)
@@ -13,9 +13,9 @@
 
 #define DEBUG_VARIABLE debug
 
-#include <media/drv-intf/saa7146_vv.h>
 #include <linux/module.h>
 #include <linux/kernel.h>
+#include "../common/saa7146_vv.h"
 
 static int debug;
 module_param(debug, int, 0);
similarity index 99%
rename from drivers/media/pci/saa7146/hexium_orion.c
rename to drivers/staging/media/deprecated/saa7146/saa7146/hexium_orion.c
index 2eb4bee16b71f28175854cc636472c903f0f4228..ebd63998ac79912a826ff8049aaf4d289b046812 100644 (file)
@@ -13,9 +13,9 @@
 
 #define DEBUG_VARIABLE debug
 
-#include <media/drv-intf/saa7146_vv.h>
 #include <linux/module.h>
 #include <linux/kernel.h>
+#include "../common/saa7146_vv.h"
 
 static int debug;
 module_param(debug, int, 0);
similarity index 99%
rename from drivers/media/pci/saa7146/mxb.c
rename to drivers/staging/media/deprecated/saa7146/saa7146/mxb.c
index 7ded8f5b05cb32ca8adbbdc21e00dee5ec155e80..3e568f952dae5827f3590bfa8ece24c614aaa969 100644 (file)
 
 #define DEBUG_VARIABLE debug
 
-#include <media/drv-intf/saa7146_vv.h>
 #include <media/tuner.h>
 #include <media/v4l2-common.h>
 #include <media/i2c/saa7115.h>
 #include <linux/module.h>
 #include <linux/kernel.h>
 
+#include "../common/saa7146_vv.h"
 #include "tea6415c.h"
 #include "tea6420.h"
 
similarity index 83%
rename from drivers/media/pci/ttpci/Kconfig
rename to drivers/staging/media/deprecated/saa7146/ttpci/Kconfig
index 65a6832a6b9630f77d77a407c8b4a018246b3d4f..8c85ed58e9385fc440b0e2f56763f332aad04c81 100644 (file)
@@ -1,6 +1,6 @@
 # SPDX-License-Identifier: GPL-2.0-only
 config DVB_BUDGET_CORE
-       tristate "SAA7146 DVB cards (aka Budget, Nova-PCI)"
+       tristate "SAA7146 DVB cards (aka Budget, Nova-PCI) (DEPRECATED)"
        depends on DVB_CORE && PCI && I2C
        select VIDEO_SAA7146
        select TTPCI_EEPROM
@@ -10,7 +10,7 @@ config DVB_BUDGET_CORE
          MPEG2 decoder.
 
 config DVB_BUDGET
-       tristate "Budget cards"
+       tristate "Budget cards (DEPRECATED)"
        depends on DVB_BUDGET_CORE && I2C
        select DVB_STV0299 if MEDIA_SUBDRV_AUTOSELECT
        select DVB_VES1X93 if MEDIA_SUBDRV_AUTOSELECT
@@ -30,13 +30,16 @@ config DVB_BUDGET
          or Nova-PCI cards) without onboard MPEG2 decoder, and without
          analog inputs or an onboard Common Interface connector.
 
+         This driver is deprecated and is scheduled for removal by
+         the beginning of 2023. See the TODO file for more information.
+
          Say Y if you own such a card and want to use it.
 
          To compile this driver as a module, choose M here: the
          module will be called budget.
 
 config DVB_BUDGET_CI
-       tristate "Budget cards with onboard CI connector"
+       tristate "Budget cards with onboard CI connector (DEPRECATED)"
        depends on DVB_BUDGET_CORE && I2C
        select DVB_STV0297 if MEDIA_SUBDRV_AUTOSELECT
        select DVB_STV0299 if MEDIA_SUBDRV_AUTOSELECT
@@ -57,13 +60,16 @@ config DVB_BUDGET_CI
          Note: The Common Interface is not yet supported by this driver
          due to lack of information from the vendor.
 
+         This driver is deprecated and is scheduled for removal by
+         the beginning of 2023. See the TODO file for more information.
+
          Say Y if you own such a card and want to use it.
 
          To compile this driver as a module, choose M here: the
          module will be called budget-ci.
 
 config DVB_BUDGET_AV
-       tristate "Budget cards with analog video inputs"
+       tristate "Budget cards with analog video inputs (DEPRECATED)"
        depends on DVB_BUDGET_CORE && I2C
        select VIDEO_SAA7146_VV
        depends on VIDEO_DEV    # dependencies of VIDEO_SAA7146_VV
@@ -80,6 +86,9 @@ config DVB_BUDGET_AV
          (so called Budget- or Nova-PCI cards) without onboard
          MPEG2 decoder, but with one or more analog video inputs.
 
+         This driver is deprecated and is scheduled for removal by
+         the beginning of 2023. See the TODO file for more information.
+
          Say Y if you own such a card and want to use it.
 
          To compile this driver as a module, choose M here: the
diff --git a/drivers/staging/media/deprecated/saa7146/ttpci/TODO b/drivers/staging/media/deprecated/saa7146/ttpci/TODO
new file mode 100644 (file)
index 0000000..c9ae2ec
--- /dev/null
@@ -0,0 +1,7 @@
+The saa7146-based drivers are one of the few drivers still not using
+the vb2 framework, so these drivers are now deprecated with the intent of
+removing them altogether by the beginning of 2023.
+
+In order to keep these drivers they have to be converted to vb2.
+If someone is interested in doing this work, then contact the
+linux-media mailinglist (https://linuxtv.org/lists.php).
similarity index 99%
rename from drivers/media/pci/ttpci/budget-av.c
rename to drivers/staging/media/deprecated/saa7146/ttpci/budget-av.c
index 3cb83005cf09b6c186a081b144ceb2e3657cfab8..0c61a2dec2211afa19ac1765196b37aefc9860af 100644 (file)
@@ -29,7 +29,7 @@
 #include "tda1004x.h"
 #include "tua6100.h"
 #include "dvb-pll.h"
-#include <media/drv-intf/saa7146_vv.h>
+#include "../common/saa7146_vv.h"
 #include <linux/module.h>
 #include <linux/errno.h>
 #include <linux/slab.h>
similarity index 98%
rename from drivers/media/pci/ttpci/budget.h
rename to drivers/staging/media/deprecated/saa7146/ttpci/budget.h
index bd87432e6cde021b5ac33cb6b85d4e90efa66b32..82cc0df492b3975c95a15d33f42c372a2efdcb55 100644 (file)
@@ -13,7 +13,7 @@
 #include <linux/module.h>
 #include <linux/mutex.h>
 
-#include <media/drv-intf/saa7146.h>
+#include "../common/saa7146.h"
 
 extern int budget_debug;