diff options
| author | Mauro Carvalho Chehab <mchehab@redhat.com> | 2008-12-29 22:25:09 -0200 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2008-12-29 22:25:09 -0200 |
| commit | 0142ec0942134ba65b471a134fcd3f7e13b9d53e (patch) | |
| tree | ac0c52202adf900ac5290d2181cf7896942a0349 /linux/drivers/media | |
| parent | 313e51a6c4a38ae0441b77f860d48f800bb2e861 (diff) | |
| download | mediapointer-dvb-s2-0142ec0942134ba65b471a134fcd3f7e13b9d53e.tar.gz mediapointer-dvb-s2-0142ec0942134ba65b471a134fcd3f7e13b9d53e.tar.bz2 | |
A few kernel sync stuff
From: Mauro Carvalho Chehab <mchehab@redhat.com>
- b2c2 Kconfig: -git merge happened on a different order;
- firmare/Makefile: Update from upstream
kernel-sync:
Priority: normal
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'linux/drivers/media')
| -rw-r--r-- | linux/drivers/media/dvb/b2c2/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/linux/drivers/media/dvb/b2c2/Kconfig b/linux/drivers/media/dvb/b2c2/Kconfig index bd21c3bf2..a8c6249c4 100644 --- a/linux/drivers/media/dvb/b2c2/Kconfig +++ b/linux/drivers/media/dvb/b2c2/Kconfig @@ -13,8 +13,8 @@ config DVB_B2C2_FLEXCOP select DVB_TUNER_ITD1000 if !DVB_FE_CUSTOMISE select DVB_ISL6421 if !DVB_FE_CUSTOMISE select DVB_CX24123 if !DVB_FE_CUSTOMISE - select DVB_TUNER_CX24113 if !DVB_FE_CUSTOMISE select MEDIA_TUNER_SIMPLE if !MEDIA_TUNER_CUSTOMIZE + select DVB_TUNER_CX24113 if !DVB_FE_CUSTOMISE help Support for the digital TV receiver chip made by B2C2 Inc. included in Technisats PCI cards and USB boxes. |