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 | |
| 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')
| -rw-r--r-- | linux/drivers/media/dvb/b2c2/Kconfig | 2 | ||||
| -rw-r--r-- | linux/firmware/Makefile | 5 |
2 files changed, 5 insertions, 2 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. diff --git a/linux/firmware/Makefile b/linux/firmware/Makefile index bc3dc8100..6554f2ea8 100644 --- a/linux/firmware/Makefile +++ b/linux/firmware/Makefile @@ -12,7 +12,7 @@ fw-external-y := $(subst ",,$(CONFIG_EXTRA_FIRMWARE)) # There are three cases to care about: # 1. Building kernel with CONFIG_FIRMWARE_IN_KERNEL=y -- $(fw-shipped-y) should # include the firmware files to include, according to .config -# 2. 'make modules_install', which will install firmware for modules, and +# 2. 'make modules_install', which will install firmware for modules, and # _also_ for the in-kernel drivers when CONFIG_FIRMWARE_IN_KERNEL=n # 3. 'make firmware_install', which installs all firmware, unconditionally. @@ -24,6 +24,9 @@ fw-shipped-$(CONFIG_ATARI_DSP56K) += dsp56k/bootstrap.bin fw-shipped-$(CONFIG_ATM_AMBASSADOR) += atmsar11.fw fw-shipped-$(CONFIG_CASSINI) += sun/cassini.bin fw-shipped-$(CONFIG_COMPUTONE) += intelliport2.bin +fw-shipped-$(CONFIG_CHELSIO_T3) += cxgb3/t3b_psram-1.1.0.bin \ + cxgb3/t3c_psram-1.1.0.bin \ + cxgb3/t3fw-7.0.0.bin fw-shipped-$(CONFIG_DVB_TTUSB_BUDGET) += ttusb-budget/dspbootcode.bin fw-shipped-$(CONFIG_SMCTR) += tr_smctr.bin fw-shipped-$(CONFIG_SND_KORG1212) += korg/k1212.dsp |