Merge branch 'master' into upstream (d99ef36e) · Commits · 戴 / test

drivers/media/dvb/Kconfig

+5 −5

Original line number	Diff line number	Diff line
		@@ -22,26 +22,26 @@ config DVB
		source "drivers/media/dvb/dvb-core/Kconfig"

		comment "Supported SAA7146 based PCI Adapters"
		depends on DVB_CORE && PCI
		depends on DVB_CORE && PCI && I2C
		source "drivers/media/dvb/ttpci/Kconfig"

		comment "Supported USB Adapters"
		depends on DVB_CORE && USB
		depends on DVB_CORE && USB && I2C
		source "drivers/media/dvb/dvb-usb/Kconfig"
		source "drivers/media/dvb/ttusb-budget/Kconfig"
		source "drivers/media/dvb/ttusb-dec/Kconfig"
		source "drivers/media/dvb/cinergyT2/Kconfig"

		comment "Supported FlexCopII (B2C2) Adapters"
		depends on DVB_CORE && (PCI \|\| USB)
		depends on DVB_CORE && (PCI \|\| USB) && I2C
		source "drivers/media/dvb/b2c2/Kconfig"

		comment "Supported BT878 Adapters"
		depends on DVB_CORE && PCI
		depends on DVB_CORE && PCI && I2C
		source "drivers/media/dvb/bt8xx/Kconfig"

		comment "Supported Pluto2 Adapters"
		depends on DVB_CORE && PCI
		depends on DVB_CORE && PCI && I2C
		source "drivers/media/dvb/pluto2/Kconfig"

		comment "Supported DVB Frontends"

+3 −3

Original line number	Diff line number	Diff line
		config DVB_B2C2_FLEXCOP
		tristate "Technisat/B2C2 FlexCopII(b) and FlexCopIII adapters"
		depends on DVB_CORE
		depends on DVB_CORE && I2C
		select DVB_STV0299
		select DVB_MT352
		select DVB_MT312
		@@ -16,7 +16,7 @@ config DVB_B2C2_FLEXCOP

		config DVB_B2C2_FLEXCOP_PCI
		tristate "Technisat/B2C2 Air/Sky/Cable2PC PCI"
		depends on DVB_B2C2_FLEXCOP && PCI
		depends on DVB_B2C2_FLEXCOP && PCI && I2C
		help
		Support for the Air/Sky/CableStar2 PCI card (DVB/ATSC) by Technisat/B2C2.

		@@ -24,7 +24,7 @@ config DVB_B2C2_FLEXCOP_PCI

		config DVB_B2C2_FLEXCOP_USB
		tristate "Technisat/B2C2 Air/Sky/Cable2PC USB"
		depends on DVB_B2C2_FLEXCOP && USB
		depends on DVB_B2C2_FLEXCOP && USB && I2C
		help
		Support for the Air/Sky/Cable2PC USB1.1 box (DVB/ATSC) by Technisat/B2C2,

+1 −1

Original line number	Diff line number	Diff line
		config DVB_BT8XX
		tristate "BT8xx based PCI cards"
		depends on DVB_CORE && PCI && VIDEO_BT848
		depends on DVB_CORE && PCI && I2C && VIDEO_BT848
		select DVB_MT352
		select DVB_SP887X
		select DVB_NXT6000

+3 −3

Original line number	Diff line number	Diff line
		@@ -115,7 +115,7 @@ static int is_pci_slot_eq(struct pci_dev* adev, struct pci_dev* bdev)
		return 0;
		}

		static struct bt878 __init dvb_bt8xx_878_match(unsigned int bttv_nr, struct pci_dev bttv_pci_dev)
		static struct bt878 __devinit dvb_bt8xx_878_match(unsigned int bttv_nr, struct pci_dev bttv_pci_dev)
		{
		unsigned int card_nr;

		@@ -709,7 +709,7 @@ static void frontend_init(struct dvb_bt8xx_card *card, u32 type)
		}
		}

		static int __init dvb_bt8xx_load_card(struct dvb_bt8xx_card *card, u32 type)
		static int __devinit dvb_bt8xx_load_card(struct dvb_bt8xx_card *card, u32 type)
		{
		int result;

		@@ -794,7 +794,7 @@ static int __init dvb_bt8xx_load_card(struct dvb_bt8xx_card *card, u32 type)
		return 0;
		}

		static int dvb_bt8xx_probe(struct bttv_sub_device *sub)
		static int __devinit dvb_bt8xx_probe(struct bttv_sub_device *sub)
		{
		struct dvb_bt8xx_card *card;
		struct pci_dev* bttv_pci_dev;

+1 −1

Original line number	Diff line number	Diff line
		config DVB_USB
		tristate "Support for various USB DVB devices"
		depends on DVB_CORE && USB
		depends on DVB_CORE && USB && I2C
		select FW_LOADER
		help
		By enabling this you will be able to choose the various supported