[media] btcx-risc: move from media/i2c to media/common
authorHans Verkuil <hans.verkuil@cisco.com>
Wed, 6 Feb 2013 10:57:57 +0000 (07:57 -0300)
committerMauro Carvalho Chehab <mchehab@redhat.com>
Fri, 8 Feb 2013 18:11:25 +0000 (16:11 -0200)
The btcx-risc module is a helper module for bttv/conexant based TV cards.
It isn't an i2c module at all, instead it should be in common since it is
used by 4 pci drivers.

Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
12 files changed:
drivers/media/common/Kconfig
drivers/media/common/Makefile
drivers/media/common/btcx-risc.c [new file with mode: 0644]
drivers/media/common/btcx-risc.h [new file with mode: 0644]
drivers/media/i2c/Kconfig
drivers/media/i2c/Makefile
drivers/media/i2c/btcx-risc.c [deleted file]
drivers/media/i2c/btcx-risc.h [deleted file]
drivers/media/pci/bt8xx/Makefile
drivers/media/pci/cx23885/Makefile
drivers/media/pci/cx25821/Makefile
drivers/media/pci/cx88/Makefile

index dfac52f312cf560e4f44aab30af817998c7ea183..28c8a602e7ef88ceca25bfe32b4dc5d46c2917e8 100644 (file)
@@ -8,6 +8,10 @@ comment "common driver options"
 config VIDEO_CX2341X
        tristate
 
+config VIDEO_BTCX
+       depends on PCI
+       tristate
+
 source "drivers/media/common/b2c2/Kconfig"
 source "drivers/media/common/saa7146/Kconfig"
 source "drivers/media/common/siano/Kconfig"
index 9b8ea4fae06fa06df35c8dd8a7b6303291268acf..cfe34499d993d44a5e4d5d6a97aeef107538f944 100644 (file)
@@ -1,2 +1,3 @@
 obj-y += b2c2/ saa7146/ siano/
 obj-$(CONFIG_VIDEO_CX2341X) += cx2341x.o
+obj-$(CONFIG_VIDEO_BTCX)  += btcx-risc.o
diff --git a/drivers/media/common/btcx-risc.c b/drivers/media/common/btcx-risc.c
new file mode 100644 (file)
index 0000000..ac1b268
--- /dev/null
@@ -0,0 +1,260 @@
+/*
+
+    btcx-risc.c
+
+    bt848/bt878/cx2388x risc code generator.
+
+    (c) 2000-03 Gerd Knorr <kraxel@bytesex.org> [SuSE Labs]
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+*/
+
+#include <linux/module.h>
+#include <linux/init.h>
+#include <linux/pci.h>
+#include <linux/interrupt.h>
+#include <linux/videodev2.h>
+#include <asm/page.h>
+#include <asm/pgtable.h>
+
+#include "btcx-risc.h"
+
+MODULE_DESCRIPTION("some code shared by bttv and cx88xx drivers");
+MODULE_AUTHOR("Gerd Knorr");
+MODULE_LICENSE("GPL");
+
+static unsigned int debug;
+module_param(debug, int, 0644);
+MODULE_PARM_DESC(debug,"debug messages, default is 0 (no)");
+
+/* ---------------------------------------------------------- */
+/* allocate/free risc memory                                  */
+
+static int memcnt;
+
+void btcx_riscmem_free(struct pci_dev *pci,
+                      struct btcx_riscmem *risc)
+{
+       if (NULL == risc->cpu)
+               return;
+       if (debug) {
+               memcnt--;
+               printk("btcx: riscmem free [%d] dma=%lx\n",
+                      memcnt, (unsigned long)risc->dma);
+       }
+       pci_free_consistent(pci, risc->size, risc->cpu, risc->dma);
+       memset(risc,0,sizeof(*risc));
+}
+
+int btcx_riscmem_alloc(struct pci_dev *pci,
+                      struct btcx_riscmem *risc,
+                      unsigned int size)
+{
+       __le32 *cpu;
+       dma_addr_t dma = 0;
+
+       if (NULL != risc->cpu && risc->size < size)
+               btcx_riscmem_free(pci,risc);
+       if (NULL == risc->cpu) {
+               cpu = pci_alloc_consistent(pci, size, &dma);
+               if (NULL == cpu)
+                       return -ENOMEM;
+               risc->cpu  = cpu;
+               risc->dma  = dma;
+               risc->size = size;
+               if (debug) {
+                       memcnt++;
+                       printk("btcx: riscmem alloc [%d] dma=%lx cpu=%p size=%d\n",
+                              memcnt, (unsigned long)dma, cpu, size);
+               }
+       }
+       memset(risc->cpu,0,risc->size);
+       return 0;
+}
+
+/* ---------------------------------------------------------- */
+/* screen overlay helpers                                     */
+
+int
+btcx_screen_clips(int swidth, int sheight, struct v4l2_rect *win,
+                 struct v4l2_clip *clips, unsigned int n)
+{
+       if (win->left < 0) {
+               /* left */
+               clips[n].c.left = 0;
+               clips[n].c.top = 0;
+               clips[n].c.width  = -win->left;
+               clips[n].c.height = win->height;
+               n++;
+       }
+       if (win->left + win->width > swidth) {
+               /* right */
+               clips[n].c.left   = swidth - win->left;
+               clips[n].c.top    = 0;
+               clips[n].c.width  = win->width - clips[n].c.left;
+               clips[n].c.height = win->height;
+               n++;
+       }
+       if (win->top < 0) {
+               /* top */
+               clips[n].c.left = 0;
+               clips[n].c.top = 0;
+               clips[n].c.width  = win->width;
+               clips[n].c.height = -win->top;
+               n++;
+       }
+       if (win->top + win->height > sheight) {
+               /* bottom */
+               clips[n].c.left = 0;
+               clips[n].c.top = sheight - win->top;
+               clips[n].c.width  = win->width;
+               clips[n].c.height = win->height - clips[n].c.top;
+               n++;
+       }
+       return n;
+}
+
+int
+btcx_align(struct v4l2_rect *win, struct v4l2_clip *clips, unsigned int n, int mask)
+{
+       s32 nx,nw,dx;
+       unsigned int i;
+
+       /* fixup window */
+       nx = (win->left + mask) & ~mask;
+       nw = (win->width) & ~mask;
+       if (nx + nw > win->left + win->width)
+               nw -= mask+1;
+       dx = nx - win->left;
+       win->left  = nx;
+       win->width = nw;
+       if (debug)
+               printk(KERN_DEBUG "btcx: window align %dx%d+%d+%d [dx=%d]\n",
+                      win->width, win->height, win->left, win->top, dx);
+
+       /* fixup clips */
+       for (i = 0; i < n; i++) {
+               nx = (clips[i].c.left-dx) & ~mask;
+               nw = (clips[i].c.width) & ~mask;
+               if (nx + nw < clips[i].c.left-dx + clips[i].c.width)
+                       nw += mask+1;
+               clips[i].c.left  = nx;
+               clips[i].c.width = nw;
+               if (debug)
+                       printk(KERN_DEBUG "btcx:   clip align %dx%d+%d+%d\n",
+                              clips[i].c.width, clips[i].c.height,
+                              clips[i].c.left, clips[i].c.top);
+       }
+       return 0;
+}
+
+void
+btcx_sort_clips(struct v4l2_clip *clips, unsigned int nclips)
+{
+       struct v4l2_clip swap;
+       int i,j,n;
+
+       if (nclips < 2)
+               return;
+       for (i = nclips-2; i >= 0; i--) {
+               for (n = 0, j = 0; j <= i; j++) {
+                       if (clips[j].c.left > clips[j+1].c.left) {
+                               swap = clips[j];
+                               clips[j] = clips[j+1];
+                               clips[j+1] = swap;
+                               n++;
+                       }
+               }
+               if (0 == n)
+                       break;
+       }
+}
+
+void
+btcx_calc_skips(int line, int width, int *maxy,
+               struct btcx_skiplist *skips, unsigned int *nskips,
+               const struct v4l2_clip *clips, unsigned int nclips)
+{
+       unsigned int clip,skip;
+       int end, maxline;
+
+       skip=0;
+       maxline = 9999;
+       for (clip = 0; clip < nclips; clip++) {
+
+               /* sanity checks */
+               if (clips[clip].c.left + clips[clip].c.width <= 0)
+                       continue;
+               if (clips[clip].c.left > (signed)width)
+                       break;
+
+               /* vertical range */
+               if (line > clips[clip].c.top+clips[clip].c.height-1)
+                       continue;
+               if (line < clips[clip].c.top) {
+                       if (maxline > clips[clip].c.top-1)
+                               maxline = clips[clip].c.top-1;
+                       continue;
+               }
+               if (maxline > clips[clip].c.top+clips[clip].c.height-1)
+                       maxline = clips[clip].c.top+clips[clip].c.height-1;
+
+               /* horizontal range */
+               if (0 == skip || clips[clip].c.left > skips[skip-1].end) {
+                       /* new one */
+                       skips[skip].start = clips[clip].c.left;
+                       if (skips[skip].start < 0)
+                               skips[skip].start = 0;
+                       skips[skip].end = clips[clip].c.left + clips[clip].c.width;
+                       if (skips[skip].end > width)
+                               skips[skip].end = width;
+                       skip++;
+               } else {
+                       /* overlaps -- expand last one */
+                       end = clips[clip].c.left + clips[clip].c.width;
+                       if (skips[skip-1].end < end)
+                               skips[skip-1].end = end;
+                       if (skips[skip-1].end > width)
+                               skips[skip-1].end = width;
+               }
+       }
+       *nskips = skip;
+       *maxy = maxline;
+
+       if (debug) {
+               printk(KERN_DEBUG "btcx: skips line %d-%d:",line,maxline);
+               for (skip = 0; skip < *nskips; skip++) {
+                       printk(" %d-%d",skips[skip].start,skips[skip].end);
+               }
+               printk("\n");
+       }
+}
+
+/* ---------------------------------------------------------- */
+
+EXPORT_SYMBOL(btcx_riscmem_alloc);
+EXPORT_SYMBOL(btcx_riscmem_free);
+
+EXPORT_SYMBOL(btcx_screen_clips);
+EXPORT_SYMBOL(btcx_align);
+EXPORT_SYMBOL(btcx_sort_clips);
+EXPORT_SYMBOL(btcx_calc_skips);
+
+/*
+ * Local variables:
+ * c-basic-offset: 8
+ * End:
+ */
diff --git a/drivers/media/common/btcx-risc.h b/drivers/media/common/btcx-risc.h
new file mode 100644 (file)
index 0000000..f8bc6e8
--- /dev/null
@@ -0,0 +1,34 @@
+/*
+ */
+struct btcx_riscmem {
+       unsigned int   size;
+       __le32         *cpu;
+       __le32         *jmp;
+       dma_addr_t     dma;
+};
+
+struct btcx_skiplist {
+       int start;
+       int end;
+};
+
+int  btcx_riscmem_alloc(struct pci_dev *pci,
+                       struct btcx_riscmem *risc,
+                       unsigned int size);
+void btcx_riscmem_free(struct pci_dev *pci,
+                      struct btcx_riscmem *risc);
+
+int btcx_screen_clips(int swidth, int sheight, struct v4l2_rect *win,
+                     struct v4l2_clip *clips, unsigned int n);
+int btcx_align(struct v4l2_rect *win, struct v4l2_clip *clips,
+              unsigned int n, int mask);
+void btcx_sort_clips(struct v4l2_clip *clips, unsigned int nclips);
+void btcx_calc_skips(int line, int width, int *maxy,
+                    struct btcx_skiplist *skips, unsigned int *nskips,
+                    const struct v4l2_clip *clips, unsigned int nclips);
+
+/*
+ * Local variables:
+ * c-basic-offset: 8
+ * End:
+ */
index 97f14c24a40c6389cd757d054d7fe85f62345f8c..cd2b17148ad67736c0fd1d7e1491802d4ca52c12 100644 (file)
@@ -2,10 +2,6 @@
 # Generic video config states
 #
 
-config VIDEO_BTCX
-       depends on PCI
-       tristate
-
 config VIDEO_TVEEPROM
        tristate
        depends on I2C
index 3a8334f205f360db1e803ce328e5b314395b8332..3691e70f4e7589cdbd9cdd64d58063fe9c39f623 100644 (file)
@@ -63,6 +63,5 @@ obj-$(CONFIG_VIDEO_S5C73M3)   += s5c73m3/
 obj-$(CONFIG_VIDEO_ADP1653)    += adp1653.o
 obj-$(CONFIG_VIDEO_AS3645A)    += as3645a.o
 obj-$(CONFIG_VIDEO_SMIAPP_PLL) += smiapp-pll.o
-obj-$(CONFIG_VIDEO_BTCX)  += btcx-risc.o
 obj-$(CONFIG_VIDEO_AK881X)             += ak881x.o
 obj-$(CONFIG_VIDEO_IR_I2C)  += ir-kbd-i2c.o
diff --git a/drivers/media/i2c/btcx-risc.c b/drivers/media/i2c/btcx-risc.c
deleted file mode 100644 (file)
index ac1b268..0000000
+++ /dev/null
@@ -1,260 +0,0 @@
-/*
-
-    btcx-risc.c
-
-    bt848/bt878/cx2388x risc code generator.
-
-    (c) 2000-03 Gerd Knorr <kraxel@bytesex.org> [SuSE Labs]
-
-    This program is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-
-*/
-
-#include <linux/module.h>
-#include <linux/init.h>
-#include <linux/pci.h>
-#include <linux/interrupt.h>
-#include <linux/videodev2.h>
-#include <asm/page.h>
-#include <asm/pgtable.h>
-
-#include "btcx-risc.h"
-
-MODULE_DESCRIPTION("some code shared by bttv and cx88xx drivers");
-MODULE_AUTHOR("Gerd Knorr");
-MODULE_LICENSE("GPL");
-
-static unsigned int debug;
-module_param(debug, int, 0644);
-MODULE_PARM_DESC(debug,"debug messages, default is 0 (no)");
-
-/* ---------------------------------------------------------- */
-/* allocate/free risc memory                                  */
-
-static int memcnt;
-
-void btcx_riscmem_free(struct pci_dev *pci,
-                      struct btcx_riscmem *risc)
-{
-       if (NULL == risc->cpu)
-               return;
-       if (debug) {
-               memcnt--;
-               printk("btcx: riscmem free [%d] dma=%lx\n",
-                      memcnt, (unsigned long)risc->dma);
-       }
-       pci_free_consistent(pci, risc->size, risc->cpu, risc->dma);
-       memset(risc,0,sizeof(*risc));
-}
-
-int btcx_riscmem_alloc(struct pci_dev *pci,
-                      struct btcx_riscmem *risc,
-                      unsigned int size)
-{
-       __le32 *cpu;
-       dma_addr_t dma = 0;
-
-       if (NULL != risc->cpu && risc->size < size)
-               btcx_riscmem_free(pci,risc);
-       if (NULL == risc->cpu) {
-               cpu = pci_alloc_consistent(pci, size, &dma);
-               if (NULL == cpu)
-                       return -ENOMEM;
-               risc->cpu  = cpu;
-               risc->dma  = dma;
-               risc->size = size;
-               if (debug) {
-                       memcnt++;
-                       printk("btcx: riscmem alloc [%d] dma=%lx cpu=%p size=%d\n",
-                              memcnt, (unsigned long)dma, cpu, size);
-               }
-       }
-       memset(risc->cpu,0,risc->size);
-       return 0;
-}
-
-/* ---------------------------------------------------------- */
-/* screen overlay helpers                                     */
-
-int
-btcx_screen_clips(int swidth, int sheight, struct v4l2_rect *win,
-                 struct v4l2_clip *clips, unsigned int n)
-{
-       if (win->left < 0) {
-               /* left */
-               clips[n].c.left = 0;
-               clips[n].c.top = 0;
-               clips[n].c.width  = -win->left;
-               clips[n].c.height = win->height;
-               n++;
-       }
-       if (win->left + win->width > swidth) {
-               /* right */
-               clips[n].c.left   = swidth - win->left;
-               clips[n].c.top    = 0;
-               clips[n].c.width  = win->width - clips[n].c.left;
-               clips[n].c.height = win->height;
-               n++;
-       }
-       if (win->top < 0) {
-               /* top */
-               clips[n].c.left = 0;
-               clips[n].c.top = 0;
-               clips[n].c.width  = win->width;
-               clips[n].c.height = -win->top;
-               n++;
-       }
-       if (win->top + win->height > sheight) {
-               /* bottom */
-               clips[n].c.left = 0;
-               clips[n].c.top = sheight - win->top;
-               clips[n].c.width  = win->width;
-               clips[n].c.height = win->height - clips[n].c.top;
-               n++;
-       }
-       return n;
-}
-
-int
-btcx_align(struct v4l2_rect *win, struct v4l2_clip *clips, unsigned int n, int mask)
-{
-       s32 nx,nw,dx;
-       unsigned int i;
-
-       /* fixup window */
-       nx = (win->left + mask) & ~mask;
-       nw = (win->width) & ~mask;
-       if (nx + nw > win->left + win->width)
-               nw -= mask+1;
-       dx = nx - win->left;
-       win->left  = nx;
-       win->width = nw;
-       if (debug)
-               printk(KERN_DEBUG "btcx: window align %dx%d+%d+%d [dx=%d]\n",
-                      win->width, win->height, win->left, win->top, dx);
-
-       /* fixup clips */
-       for (i = 0; i < n; i++) {
-               nx = (clips[i].c.left-dx) & ~mask;
-               nw = (clips[i].c.width) & ~mask;
-               if (nx + nw < clips[i].c.left-dx + clips[i].c.width)
-                       nw += mask+1;
-               clips[i].c.left  = nx;
-               clips[i].c.width = nw;
-               if (debug)
-                       printk(KERN_DEBUG "btcx:   clip align %dx%d+%d+%d\n",
-                              clips[i].c.width, clips[i].c.height,
-                              clips[i].c.left, clips[i].c.top);
-       }
-       return 0;
-}
-
-void
-btcx_sort_clips(struct v4l2_clip *clips, unsigned int nclips)
-{
-       struct v4l2_clip swap;
-       int i,j,n;
-
-       if (nclips < 2)
-               return;
-       for (i = nclips-2; i >= 0; i--) {
-               for (n = 0, j = 0; j <= i; j++) {
-                       if (clips[j].c.left > clips[j+1].c.left) {
-                               swap = clips[j];
-                               clips[j] = clips[j+1];
-                               clips[j+1] = swap;
-                               n++;
-                       }
-               }
-               if (0 == n)
-                       break;
-       }
-}
-
-void
-btcx_calc_skips(int line, int width, int *maxy,
-               struct btcx_skiplist *skips, unsigned int *nskips,
-               const struct v4l2_clip *clips, unsigned int nclips)
-{
-       unsigned int clip,skip;
-       int end, maxline;
-
-       skip=0;
-       maxline = 9999;
-       for (clip = 0; clip < nclips; clip++) {
-
-               /* sanity checks */
-               if (clips[clip].c.left + clips[clip].c.width <= 0)
-                       continue;
-               if (clips[clip].c.left > (signed)width)
-                       break;
-
-               /* vertical range */
-               if (line > clips[clip].c.top+clips[clip].c.height-1)
-                       continue;
-               if (line < clips[clip].c.top) {
-                       if (maxline > clips[clip].c.top-1)
-                               maxline = clips[clip].c.top-1;
-                       continue;
-               }
-               if (maxline > clips[clip].c.top+clips[clip].c.height-1)
-                       maxline = clips[clip].c.top+clips[clip].c.height-1;
-
-               /* horizontal range */
-               if (0 == skip || clips[clip].c.left > skips[skip-1].end) {
-                       /* new one */
-                       skips[skip].start = clips[clip].c.left;
-                       if (skips[skip].start < 0)
-                               skips[skip].start = 0;
-                       skips[skip].end = clips[clip].c.left + clips[clip].c.width;
-                       if (skips[skip].end > width)
-                               skips[skip].end = width;
-                       skip++;
-               } else {
-                       /* overlaps -- expand last one */
-                       end = clips[clip].c.left + clips[clip].c.width;
-                       if (skips[skip-1].end < end)
-                               skips[skip-1].end = end;
-                       if (skips[skip-1].end > width)
-                               skips[skip-1].end = width;
-               }
-       }
-       *nskips = skip;
-       *maxy = maxline;
-
-       if (debug) {
-               printk(KERN_DEBUG "btcx: skips line %d-%d:",line,maxline);
-               for (skip = 0; skip < *nskips; skip++) {
-                       printk(" %d-%d",skips[skip].start,skips[skip].end);
-               }
-               printk("\n");
-       }
-}
-
-/* ---------------------------------------------------------- */
-
-EXPORT_SYMBOL(btcx_riscmem_alloc);
-EXPORT_SYMBOL(btcx_riscmem_free);
-
-EXPORT_SYMBOL(btcx_screen_clips);
-EXPORT_SYMBOL(btcx_align);
-EXPORT_SYMBOL(btcx_sort_clips);
-EXPORT_SYMBOL(btcx_calc_skips);
-
-/*
- * Local variables:
- * c-basic-offset: 8
- * End:
- */
diff --git a/drivers/media/i2c/btcx-risc.h b/drivers/media/i2c/btcx-risc.h
deleted file mode 100644 (file)
index f8bc6e8..0000000
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- */
-struct btcx_riscmem {
-       unsigned int   size;
-       __le32         *cpu;
-       __le32         *jmp;
-       dma_addr_t     dma;
-};
-
-struct btcx_skiplist {
-       int start;
-       int end;
-};
-
-int  btcx_riscmem_alloc(struct pci_dev *pci,
-                       struct btcx_riscmem *risc,
-                       unsigned int size);
-void btcx_riscmem_free(struct pci_dev *pci,
-                      struct btcx_riscmem *risc);
-
-int btcx_screen_clips(int swidth, int sheight, struct v4l2_rect *win,
-                     struct v4l2_clip *clips, unsigned int n);
-int btcx_align(struct v4l2_rect *win, struct v4l2_clip *clips,
-              unsigned int n, int mask);
-void btcx_sort_clips(struct v4l2_clip *clips, unsigned int nclips);
-void btcx_calc_skips(int line, int width, int *maxy,
-                    struct btcx_skiplist *skips, unsigned int *nskips,
-                    const struct v4l2_clip *clips, unsigned int nclips);
-
-/*
- * Local variables:
- * c-basic-offset: 8
- * End:
- */
index 5f06597c6a6e1d59c95e3fc3aca613ba7386cdcc..f9fe7c4e7d53bae5f5e116ad3967ebc213c7ebc1 100644 (file)
@@ -8,4 +8,5 @@ obj-$(CONFIG_DVB_BT8XX) += bt878.o dvb-bt8xx.o dst.o dst_ca.o
 ccflags-y += -Idrivers/media/dvb-core
 ccflags-y += -Idrivers/media/dvb-frontends
 ccflags-y += -Idrivers/media/i2c
+ccflags-y += -Idrivers/media/common
 ccflags-y += -Idrivers/media/tuners
index a2cbdcf15a8c48fde4cd79c43b33dd92c81a8def..2a2cafb8cf5be31b48daf3c881aa50871e9a90fa 100644 (file)
@@ -8,6 +8,7 @@ obj-$(CONFIG_VIDEO_CX23885) += cx23885.o
 obj-$(CONFIG_MEDIA_ALTERA_CI) += altera-ci.o
 
 ccflags-y += -Idrivers/media/i2c
+ccflags-y += -Idrivers/media/common
 ccflags-y += -Idrivers/media/tuners
 ccflags-y += -Idrivers/media/dvb-core
 ccflags-y += -Idrivers/media/dvb-frontends
index 5bf3ea4c1556a642d11dc7709faf8cb64a6a0b9e..caa32b7b51f8765283c403d20fa93d2f0d886b3c 100644 (file)
@@ -8,6 +8,7 @@ obj-$(CONFIG_VIDEO_CX25821) += cx25821.o
 obj-$(CONFIG_VIDEO_CX25821_ALSA) += cx25821-alsa.o
 
 ccflags-y += -Idrivers/media/i2c
+ccflags-y += -Idrivers/media/common
 ccflags-y += -Idrivers/media/tuners
 ccflags-y += -Idrivers/media/dvb-core
 ccflags-y += -Idrivers/media/dvb-frontends
index d3679c3ee248bf5bf5e14d1d0de2ea166bb2f1aa..8619c1becee240311282200dcded6e7b20a9de8b 100644 (file)
@@ -11,6 +11,7 @@ obj-$(CONFIG_VIDEO_CX88_DVB) += cx88-dvb.o
 obj-$(CONFIG_VIDEO_CX88_VP3054) += cx88-vp3054-i2c.o
 
 ccflags-y += -Idrivers/media/i2c
+ccflags-y += -Idrivers/media/common
 ccflags-y += -Idrivers/media/tuners
 ccflags-y += -Idrivers/media/dvb-core
 ccflags-y += -Idrivers/media/dvb-frontends