aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
Diffstat (limited to 'drivers')
-rw-r--r--drivers/media/Kconfig4
-rw-r--r--drivers/media/common/Kconfig2
-rw-r--r--drivers/media/common/Makefile2
-rw-r--r--drivers/media/common/b2c2/Kconfig31
-rw-r--r--drivers/media/common/b2c2/Makefile7
-rw-r--r--drivers/media/common/b2c2/flexcop-common.h (renamed from drivers/media/pci/b2c2/flexcop-common.h)0
-rw-r--r--drivers/media/common/b2c2/flexcop-eeprom.c (renamed from drivers/media/pci/b2c2/flexcop-eeprom.c)0
-rw-r--r--drivers/media/common/b2c2/flexcop-fe-tuner.c (renamed from drivers/media/pci/b2c2/flexcop-fe-tuner.c)0
-rw-r--r--drivers/media/common/b2c2/flexcop-hw-filter.c (renamed from drivers/media/pci/b2c2/flexcop-hw-filter.c)0
-rw-r--r--drivers/media/common/b2c2/flexcop-i2c.c (renamed from drivers/media/pci/b2c2/flexcop-i2c.c)0
-rw-r--r--drivers/media/common/b2c2/flexcop-misc.c (renamed from drivers/media/pci/b2c2/flexcop-misc.c)0
-rw-r--r--drivers/media/common/b2c2/flexcop-reg.h (renamed from drivers/media/pci/b2c2/flexcop-reg.h)0
-rw-r--r--drivers/media/common/b2c2/flexcop-sram.c (renamed from drivers/media/pci/b2c2/flexcop-sram.c)0
-rw-r--r--drivers/media/common/b2c2/flexcop.c (renamed from drivers/media/pci/b2c2/flexcop.c)0
-rw-r--r--drivers/media/common/b2c2/flexcop.h (renamed from drivers/media/pci/b2c2/flexcop.h)0
-rw-r--r--drivers/media/common/b2c2/flexcop_ibi_value_be.h (renamed from drivers/media/pci/b2c2/flexcop_ibi_value_be.h)0
-rw-r--r--drivers/media/common/b2c2/flexcop_ibi_value_le.h (renamed from drivers/media/pci/b2c2/flexcop_ibi_value_le.h)0
-rw-r--r--drivers/media/pci/Kconfig21
-rw-r--r--drivers/media/pci/Makefile3
-rw-r--r--drivers/media/pci/b2c2/Kconfig39
-rw-r--r--drivers/media/pci/b2c2/Makefile13
-rw-r--r--drivers/media/usb/Kconfig1
-rw-r--r--drivers/media/usb/Makefile2
-rw-r--r--drivers/media/usb/b2c2/Kconfig6
-rw-r--r--drivers/media/usb/b2c2/Makefile7
-rw-r--r--drivers/media/usb/b2c2/flexcop-usb.c (renamed from drivers/media/pci/b2c2/flexcop-usb.c)0
-rw-r--r--drivers/media/usb/b2c2/flexcop-usb.h (renamed from drivers/media/pci/b2c2/flexcop-usb.h)0
27 files changed, 71 insertions, 67 deletions
diff --git a/drivers/media/Kconfig b/drivers/media/Kconfig
index 81c8662a1a7c..6343e84b361a 100644
--- a/drivers/media/Kconfig
+++ b/drivers/media/Kconfig
@@ -139,7 +139,6 @@ config DVB_NET
139 unsure say Y. 139 unsure say Y.
140 140
141comment "Media drivers" 141comment "Media drivers"
142source "drivers/media/common/Kconfig"
143source "drivers/media/rc/Kconfig" 142source "drivers/media/rc/Kconfig"
144 143
145# 144#
@@ -173,4 +172,7 @@ comment "Supported DVB Frontends"
173 depends on DVB_CORE 172 depends on DVB_CORE
174source "drivers/media/dvb-frontends/Kconfig" 173source "drivers/media/dvb-frontends/Kconfig"
175 174
175# Common drivers
176source "drivers/media/common/Kconfig"
177
176endif # MEDIA_SUPPORT 178endif # MEDIA_SUPPORT
diff --git a/drivers/media/common/Kconfig b/drivers/media/common/Kconfig
index 769c6f8142d2..4672f7d82f67 100644
--- a/drivers/media/common/Kconfig
+++ b/drivers/media/common/Kconfig
@@ -7,3 +7,5 @@ config VIDEO_SAA7146_VV
7 depends on VIDEO_V4L2 7 depends on VIDEO_V4L2
8 select VIDEOBUF_DMA_SG 8 select VIDEOBUF_DMA_SG
9 select VIDEO_SAA7146 9 select VIDEO_SAA7146
10
11source "drivers/media/common/b2c2/Kconfig"
diff --git a/drivers/media/common/Makefile b/drivers/media/common/Makefile
index e3ec9639321b..d0512d7e5555 100644
--- a/drivers/media/common/Makefile
+++ b/drivers/media/common/Makefile
@@ -1,6 +1,6 @@
1saa7146-objs := saa7146_i2c.o saa7146_core.o 1saa7146-objs := saa7146_i2c.o saa7146_core.o
2saa7146_vv-objs := saa7146_fops.o saa7146_video.o saa7146_hlp.o saa7146_vbi.o 2saa7146_vv-objs := saa7146_fops.o saa7146_video.o saa7146_hlp.o saa7146_vbi.o
3 3
4obj-y += tuners/ 4obj-y += tuners/ b2c2/
5obj-$(CONFIG_VIDEO_SAA7146) += saa7146.o 5obj-$(CONFIG_VIDEO_SAA7146) += saa7146.o
6obj-$(CONFIG_VIDEO_SAA7146_VV) += saa7146_vv.o 6obj-$(CONFIG_VIDEO_SAA7146_VV) += saa7146_vv.o
diff --git a/drivers/media/common/b2c2/Kconfig b/drivers/media/common/b2c2/Kconfig
new file mode 100644
index 000000000000..e270dd847342
--- /dev/null
+++ b/drivers/media/common/b2c2/Kconfig
@@ -0,0 +1,31 @@
1config DVB_B2C2_FLEXCOP
2 tristate
3 depends on DVB_CORE && I2C
4 depends on DVB_B2C2_FLEXCOP_PCI || DVB_B2C2_FLEXCOP_USB
5 default y
6 select DVB_PLL if !DVB_FE_CUSTOMISE
7 select DVB_STV0299 if !DVB_FE_CUSTOMISE
8 select DVB_MT352 if !DVB_FE_CUSTOMISE
9 select DVB_MT312 if !DVB_FE_CUSTOMISE
10 select DVB_NXT200X if !DVB_FE_CUSTOMISE
11 select DVB_STV0297 if !DVB_FE_CUSTOMISE
12 select DVB_BCM3510 if !DVB_FE_CUSTOMISE
13 select DVB_LGDT330X if !DVB_FE_CUSTOMISE
14 select DVB_S5H1420 if !DVB_FE_CUSTOMISE
15 select DVB_TUNER_ITD1000 if !DVB_FE_CUSTOMISE
16 select DVB_ISL6421 if !DVB_FE_CUSTOMISE
17 select DVB_CX24123 if !DVB_FE_CUSTOMISE
18 select MEDIA_TUNER_SIMPLE if !MEDIA_TUNER_CUSTOMISE
19 select DVB_TUNER_CX24113 if !DVB_FE_CUSTOMISE
20 help
21 Support for the digital TV receiver chip made by B2C2 Inc. included in
22 Technisats PCI cards and USB boxes.
23
24 Say Y if you own such a device and want to use it.
25
26config DVB_B2C2_FLEXCOP_DEBUG
27 bool "Enable debug for the B2C2 FlexCop drivers"
28 depends on DVB_B2C2_FLEXCOP
29 help
30 Say Y if you want to enable the module option to control debug messages
31 of all B2C2 FlexCop drivers.
diff --git a/drivers/media/common/b2c2/Makefile b/drivers/media/common/b2c2/Makefile
new file mode 100644
index 000000000000..377d051548a9
--- /dev/null
+++ b/drivers/media/common/b2c2/Makefile
@@ -0,0 +1,7 @@
1b2c2-flexcop-objs = flexcop.o flexcop-fe-tuner.o flexcop-i2c.o \
2 flexcop-sram.o flexcop-eeprom.o flexcop-misc.o flexcop-hw-filter.o
3obj-$(CONFIG_DVB_B2C2_FLEXCOP) += b2c2-flexcop.o
4
5ccflags-y += -Idrivers/media/dvb-core/
6ccflags-y += -Idrivers/media/dvb-frontends/
7ccflags-y += -Idrivers/media/common/tuners/
diff --git a/drivers/media/pci/b2c2/flexcop-common.h b/drivers/media/common/b2c2/flexcop-common.h
index 437912e49824..437912e49824 100644
--- a/drivers/media/pci/b2c2/flexcop-common.h
+++ b/drivers/media/common/b2c2/flexcop-common.h
diff --git a/drivers/media/pci/b2c2/flexcop-eeprom.c b/drivers/media/common/b2c2/flexcop-eeprom.c
index a25373a9bd84..a25373a9bd84 100644
--- a/drivers/media/pci/b2c2/flexcop-eeprom.c
+++ b/drivers/media/common/b2c2/flexcop-eeprom.c
diff --git a/drivers/media/pci/b2c2/flexcop-fe-tuner.c b/drivers/media/common/b2c2/flexcop-fe-tuner.c
index 850a6c606750..850a6c606750 100644
--- a/drivers/media/pci/b2c2/flexcop-fe-tuner.c
+++ b/drivers/media/common/b2c2/flexcop-fe-tuner.c
diff --git a/drivers/media/pci/b2c2/flexcop-hw-filter.c b/drivers/media/common/b2c2/flexcop-hw-filter.c
index 77e45475f4c7..77e45475f4c7 100644
--- a/drivers/media/pci/b2c2/flexcop-hw-filter.c
+++ b/drivers/media/common/b2c2/flexcop-hw-filter.c
diff --git a/drivers/media/pci/b2c2/flexcop-i2c.c b/drivers/media/common/b2c2/flexcop-i2c.c
index 965d5eb33752..965d5eb33752 100644
--- a/drivers/media/pci/b2c2/flexcop-i2c.c
+++ b/drivers/media/common/b2c2/flexcop-i2c.c
diff --git a/drivers/media/pci/b2c2/flexcop-misc.c b/drivers/media/common/b2c2/flexcop-misc.c
index f06f3a9070f5..f06f3a9070f5 100644
--- a/drivers/media/pci/b2c2/flexcop-misc.c
+++ b/drivers/media/common/b2c2/flexcop-misc.c
diff --git a/drivers/media/pci/b2c2/flexcop-reg.h b/drivers/media/common/b2c2/flexcop-reg.h
index dc4528dcbb98..dc4528dcbb98 100644
--- a/drivers/media/pci/b2c2/flexcop-reg.h
+++ b/drivers/media/common/b2c2/flexcop-reg.h
diff --git a/drivers/media/pci/b2c2/flexcop-sram.c b/drivers/media/common/b2c2/flexcop-sram.c
index f2199e43e803..f2199e43e803 100644
--- a/drivers/media/pci/b2c2/flexcop-sram.c
+++ b/drivers/media/common/b2c2/flexcop-sram.c
diff --git a/drivers/media/pci/b2c2/flexcop.c b/drivers/media/common/b2c2/flexcop.c
index b1e8c99f469b..b1e8c99f469b 100644
--- a/drivers/media/pci/b2c2/flexcop.c
+++ b/drivers/media/common/b2c2/flexcop.c
diff --git a/drivers/media/pci/b2c2/flexcop.h b/drivers/media/common/b2c2/flexcop.h
index 897b10c85ad9..897b10c85ad9 100644
--- a/drivers/media/pci/b2c2/flexcop.h
+++ b/drivers/media/common/b2c2/flexcop.h
diff --git a/drivers/media/pci/b2c2/flexcop_ibi_value_be.h b/drivers/media/common/b2c2/flexcop_ibi_value_be.h
index 8f64bdbd72bb..8f64bdbd72bb 100644
--- a/drivers/media/pci/b2c2/flexcop_ibi_value_be.h
+++ b/drivers/media/common/b2c2/flexcop_ibi_value_be.h
diff --git a/drivers/media/pci/b2c2/flexcop_ibi_value_le.h b/drivers/media/common/b2c2/flexcop_ibi_value_le.h
index c75830d7d942..c75830d7d942 100644
--- a/drivers/media/pci/b2c2/flexcop_ibi_value_le.h
+++ b/drivers/media/common/b2c2/flexcop_ibi_value_le.h
diff --git a/drivers/media/pci/Kconfig b/drivers/media/pci/Kconfig
index 3b9164af6ec4..b16529bf71b8 100644
--- a/drivers/media/pci/Kconfig
+++ b/drivers/media/pci/Kconfig
@@ -3,48 +3,39 @@
3# 3#
4 4
5menuconfig DVB_CAPTURE_DRIVERS 5menuconfig DVB_CAPTURE_DRIVERS
6 bool "DVB/ATSC adapters" 6 bool "DVB/ATSC PCI adapters"
7 depends on DVB_CORE 7 depends on DVB_CORE
8 default y 8 default y
9 ---help--- 9 ---help---
10 Say Y to select Digital TV adapters 10 Say Y to select Digital TV adapters
11 11
12if DVB_CAPTURE_DRIVERS && DVB_CORE 12if DVB_CAPTURE_DRIVERS && DVB_CORE && PCI && I2C
13 13
14comment "Supported SAA7146 based PCI Adapters" 14comment "Supported SAA7146 based PCI Adapters"
15 depends on DVB_CORE && PCI && I2C
16source "drivers/media/pci/ttpci/Kconfig" 15source "drivers/media/pci/ttpci/Kconfig"
17 16
18comment "Supported FlexCopII (B2C2) Adapters" 17comment "Supported FlexCopII (B2C2) PCI Adapters"
19 depends on DVB_CORE && (PCI || USB) && I2C
20source "drivers/media/pci/b2c2/Kconfig" 18source "drivers/media/pci/b2c2/Kconfig"
21 19
22comment "Supported BT878 Adapters" 20comment "Supported BT878 Adapters"
23 depends on DVB_CORE && PCI && I2C
24source "drivers/media/pci/bt8xx/Kconfig" 21source "drivers/media/pci/bt8xx/Kconfig"
25 22
26comment "Supported Pluto2 Adapters" 23comment "Supported Pluto2 Adapters"
27 depends on DVB_CORE && PCI && I2C
28source "drivers/media/pci/pluto2/Kconfig" 24source "drivers/media/pci/pluto2/Kconfig"
29 25
30comment "Supported SDMC DM1105 Adapters" 26comment "Supported SDMC DM1105 Adapters"
31 depends on DVB_CORE && PCI && I2C
32source "drivers/media/pci/dm1105/Kconfig" 27source "drivers/media/pci/dm1105/Kconfig"
33 28
34comment "Supported Earthsoft PT1 Adapters" 29comment "Supported Earthsoft PT1 Adapters"
35 depends on DVB_CORE && PCI && I2C
36source "drivers/media/pci/pt1/Kconfig" 30source "drivers/media/pci/pt1/Kconfig"
37 31
38comment "Supported Mantis Adapters" 32comment "Supported Mantis Adapters"
39 depends on DVB_CORE && PCI && I2C 33source "drivers/media/pci/mantis/Kconfig"
40 source "drivers/media/pci/mantis/Kconfig"
41 34
42comment "Supported nGene Adapters" 35comment "Supported nGene Adapters"
43 depends on DVB_CORE && PCI && I2C 36source "drivers/media/pci/ngene/Kconfig"
44 source "drivers/media/pci/ngene/Kconfig"
45 37
46comment "Supported ddbridge ('Octopus') Adapters" 38comment "Supported ddbridge ('Octopus') Adapters"
47 depends on DVB_CORE && PCI && I2C 39source "drivers/media/pci/ddbridge/Kconfig"
48 source "drivers/media/pci/ddbridge/Kconfig"
49 40
50endif # DVB_CAPTURE_DRIVERS 41endif # DVB_CAPTURE_DRIVERS
diff --git a/drivers/media/pci/Makefile b/drivers/media/pci/Makefile
index c5fa43a275ae..1d44fbd772b2 100644
--- a/drivers/media/pci/Makefile
+++ b/drivers/media/pci/Makefile
@@ -10,4 +10,5 @@ obj-y := ttpci/ \
10 pt1/ \ 10 pt1/ \
11 mantis/ \ 11 mantis/ \
12 ngene/ \ 12 ngene/ \
13 ddbridge/ 13 ddbridge/ \
14 b2c2/
diff --git a/drivers/media/pci/b2c2/Kconfig b/drivers/media/pci/b2c2/Kconfig
index 9e5781400744..aaa1f30f1ae0 100644
--- a/drivers/media/pci/b2c2/Kconfig
+++ b/drivers/media/pci/b2c2/Kconfig
@@ -1,45 +1,6 @@
1config DVB_B2C2_FLEXCOP
2 tristate "Technisat/B2C2 FlexCopII(b) and FlexCopIII adapters"
3 depends on DVB_CORE && I2C
4 select DVB_PLL if !DVB_FE_CUSTOMISE
5 select DVB_STV0299 if !DVB_FE_CUSTOMISE
6 select DVB_MT352 if !DVB_FE_CUSTOMISE
7 select DVB_MT312 if !DVB_FE_CUSTOMISE
8 select DVB_NXT200X if !DVB_FE_CUSTOMISE
9 select DVB_STV0297 if !DVB_FE_CUSTOMISE
10 select DVB_BCM3510 if !DVB_FE_CUSTOMISE
11 select DVB_LGDT330X if !DVB_FE_CUSTOMISE
12 select DVB_S5H1420 if !DVB_FE_CUSTOMISE
13 select DVB_TUNER_ITD1000 if !DVB_FE_CUSTOMISE
14 select DVB_ISL6421 if !DVB_FE_CUSTOMISE
15 select DVB_CX24123 if !DVB_FE_CUSTOMISE
16 select MEDIA_TUNER_SIMPLE if !MEDIA_TUNER_CUSTOMISE
17 select DVB_TUNER_CX24113 if !DVB_FE_CUSTOMISE
18 help
19 Support for the digital TV receiver chip made by B2C2 Inc. included in
20 Technisats PCI cards and USB boxes.
21
22 Say Y if you own such a device and want to use it.
23
24config DVB_B2C2_FLEXCOP_PCI 1config DVB_B2C2_FLEXCOP_PCI
25 tristate "Technisat/B2C2 Air/Sky/Cable2PC PCI" 2 tristate "Technisat/B2C2 Air/Sky/Cable2PC PCI"
26 depends on DVB_B2C2_FLEXCOP && PCI && I2C
27 help 3 help
28 Support for the Air/Sky/CableStar2 PCI card (DVB/ATSC) by Technisat/B2C2. 4 Support for the Air/Sky/CableStar2 PCI card (DVB/ATSC) by Technisat/B2C2.
29 5
30 Say Y if you own such a device and want to use it. 6 Say Y if you own such a device and want to use it.
31
32config DVB_B2C2_FLEXCOP_USB
33 tristate "Technisat/B2C2 Air/Sky/Cable2PC USB"
34 depends on DVB_B2C2_FLEXCOP && USB && I2C
35 help
36 Support for the Air/Sky/Cable2PC USB1.1 box (DVB/ATSC) by Technisat/B2C2,
37
38 Say Y if you own such a device and want to use it.
39
40config DVB_B2C2_FLEXCOP_DEBUG
41 bool "Enable debug for the B2C2 FlexCop drivers"
42 depends on DVB_B2C2_FLEXCOP
43 help
44 Say Y if you want to enable the module option to control debug messages
45 of all B2C2 FlexCop drivers.
diff --git a/drivers/media/pci/b2c2/Makefile b/drivers/media/pci/b2c2/Makefile
index 7a1f5ce6d322..e90e2366265e 100644
--- a/drivers/media/pci/b2c2/Makefile
+++ b/drivers/media/pci/b2c2/Makefile
@@ -1,16 +1,11 @@
1b2c2-flexcop-objs = flexcop.o flexcop-fe-tuner.o flexcop-i2c.o \
2 flexcop-sram.o flexcop-eeprom.o flexcop-misc.o flexcop-hw-filter.o
3obj-$(CONFIG_DVB_B2C2_FLEXCOP) += b2c2-flexcop.o
4
5ifneq ($(CONFIG_DVB_B2C2_FLEXCOP_PCI),) 1ifneq ($(CONFIG_DVB_B2C2_FLEXCOP_PCI),)
6b2c2-flexcop-objs += flexcop-dma.o 2b2c2-flexcop-pci-objs += flexcop-dma.o
7endif 3endif
8 4
9b2c2-flexcop-pci-objs = flexcop-pci.o 5b2c2-flexcop-pci-objs = flexcop-pci.o
10obj-$(CONFIG_DVB_B2C2_FLEXCOP_PCI) += b2c2-flexcop-pci.o 6obj-$(CONFIG_DVB_B2C2_FLEXCOP_PCI) += b2c2-flexcop-pci.o
11 7
12b2c2-flexcop-usb-objs = flexcop-usb.o 8ccflags-y += -Idrivers/media/dvb-core/
13obj-$(CONFIG_DVB_B2C2_FLEXCOP_USB) += b2c2-flexcop-usb.o 9ccflags-y += -Idrivers/media/dvb-frontends/
14
15ccflags-y += -Idrivers/media/dvb-core/ -Idrivers/media/dvb-frontends/
16ccflags-y += -Idrivers/media/common/tuners/ 10ccflags-y += -Idrivers/media/common/tuners/
11ccflags-y += -Idrivers/media/common/b2c2/
diff --git a/drivers/media/usb/Kconfig b/drivers/media/usb/Kconfig
index 70b1708db05a..53664b35af1c 100644
--- a/drivers/media/usb/Kconfig
+++ b/drivers/media/usb/Kconfig
@@ -14,5 +14,6 @@ source "drivers/media/usb/dvb-usb-v2/Kconfig"
14source "drivers/media/usb/ttusb-budget/Kconfig" 14source "drivers/media/usb/ttusb-budget/Kconfig"
15source "drivers/media/usb/ttusb-dec/Kconfig" 15source "drivers/media/usb/ttusb-dec/Kconfig"
16source "drivers/media/usb/siano/Kconfig" 16source "drivers/media/usb/siano/Kconfig"
17source "drivers/media/usb/b2c2/Kconfig"
17 18
18endif 19endif
diff --git a/drivers/media/usb/Makefile b/drivers/media/usb/Makefile
index 44e29f340ebd..6b30ad13c38e 100644
--- a/drivers/media/usb/Makefile
+++ b/drivers/media/usb/Makefile
@@ -3,4 +3,4 @@
3# 3#
4 4
5# DVB USB-only drivers 5# DVB USB-only drivers
6obj-y := ttusb-dec/ ttusb-budget/ dvb-usb/ dvb-usb-v2/ siano/ 6obj-y := ttusb-dec/ ttusb-budget/ dvb-usb/ dvb-usb-v2/ siano/ b2c2/
diff --git a/drivers/media/usb/b2c2/Kconfig b/drivers/media/usb/b2c2/Kconfig
new file mode 100644
index 000000000000..3af7c4155473
--- /dev/null
+++ b/drivers/media/usb/b2c2/Kconfig
@@ -0,0 +1,6 @@
1config DVB_B2C2_FLEXCOP_USB
2 tristate "Technisat/B2C2 Air/Sky/Cable2PC USB"
3 help
4 Support for the Air/Sky/Cable2PC USB1.1 box (DVB/ATSC) by Technisat/B2C2,
5
6 Say Y if you own such a device and want to use it.
diff --git a/drivers/media/usb/b2c2/Makefile b/drivers/media/usb/b2c2/Makefile
new file mode 100644
index 000000000000..9eaf208bfa43
--- /dev/null
+++ b/drivers/media/usb/b2c2/Makefile
@@ -0,0 +1,7 @@
1b2c2-flexcop-usb-objs = flexcop-usb.o
2obj-$(CONFIG_DVB_B2C2_FLEXCOP_USB) += b2c2-flexcop-usb.o
3
4ccflags-y += -Idrivers/media/dvb-core/
5ccflags-y += -Idrivers/media/dvb-frontends/
6ccflags-y += -Idrivers/media/common/tuners/
7ccflags-y += -Idrivers/media/common/b2c2/
diff --git a/drivers/media/pci/b2c2/flexcop-usb.c b/drivers/media/usb/b2c2/flexcop-usb.c
index 8b6275f85908..8b6275f85908 100644
--- a/drivers/media/pci/b2c2/flexcop-usb.c
+++ b/drivers/media/usb/b2c2/flexcop-usb.c
diff --git a/drivers/media/pci/b2c2/flexcop-usb.h b/drivers/media/usb/b2c2/flexcop-usb.h
index 92529a9c4475..92529a9c4475 100644
--- a/drivers/media/pci/b2c2/flexcop-usb.h
+++ b/drivers/media/usb/b2c2/flexcop-usb.h