Merge branch 'linus' into cpus4096

Conflicts:

	kernel/stop_machine.c

Signed-off-by: Ingo Molnar <mingo@elte.hu>

1 files changed, 0 insertions, 4 deletions

diff --git a/drivers/media/dvb/ttpci/Kconfig b/drivers/media/dvb/ttpci/Kconfig
index 87c973ac668b..41b5a988b619 100644
--- a/drivers/media/dvb/ttpci/Kconfig
+++ b/drivers/media/dvb/ttpci/Kconfig
@@ -5,8 +5,6 @@ config TTPCI_EEPROM
 config DVB_AV7110
         tristate "AV7110 cards"
         depends on DVB_CORE && PCI && I2C
-        depends on HOTPLUG
-        select FW_LOADER if !DVB_AV7110_FIRMWARE
         select TTPCI_EEPROM
         select VIDEO_SAA7146_VV
         depends on VIDEO_DEV    # dependencies of VIDEO_SAA7146_VV
@@ -127,14 +125,12 @@ config DVB_BUDGET_AV
         depends on DVB_BUDGET_CORE && I2C
         select VIDEO_SAA7146_VV
         depends on VIDEO_DEV    # dependencies of VIDEO_SAA7146_VV
-        depends on HOTPLUG      # dependency of FW_LOADER
         select DVB_PLL if !DVB_FE_CUSTOMISE
         select DVB_STV0299 if !DVB_FE_CUSTOMISE
         select DVB_TDA1004X if !DVB_FE_CUSTOMISE
         select DVB_TDA10021 if !DVB_FE_CUSTOMISE
         select DVB_TDA10023 if !DVB_FE_CUSTOMISE
         select DVB_TUA6100 if !DVB_FE_CUSTOMISE
-        select FW_LOADER
         help
           Support for simple SAA7146 based DVB cards
           (so called Budget- or Nova-PCI cards) without onboard