summaryrefslogtreecommitdiffstats
path: root/drivers/media/video/pvrusb2/Kconfig
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2008-07-31 12:38:04 +0200
committerIngo Molnar <mingo@elte.hu>2008-07-31 12:38:04 +0200
commit5fbf24659b75356e2142e1f1b88f67b34cbc3e75 (patch)
tree0e470e4cc89b72e3d74939f8c39396a6a0bebb3a /drivers/media/video/pvrusb2/Kconfig
parentd89961e2dc87b6e30b8e3f60bd2af5cd92cf4643 (diff)
parent6e86841d05f371b5b9b86ce76c02aaee83352298 (diff)
downloadop-kernel-dev-5fbf24659b75356e2142e1f1b88f67b34cbc3e75.zip
op-kernel-dev-5fbf24659b75356e2142e1f1b88f67b34cbc3e75.tar.gz
Merge branch 'linus' into x86/xen
Diffstat (limited to 'drivers/media/video/pvrusb2/Kconfig')
-rw-r--r--drivers/media/video/pvrusb2/Kconfig2
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/media/video/pvrusb2/Kconfig b/drivers/media/video/pvrusb2/Kconfig
index 4482b2c..19eb274 100644
--- a/drivers/media/video/pvrusb2/Kconfig
+++ b/drivers/media/video/pvrusb2/Kconfig
@@ -2,8 +2,6 @@ config VIDEO_PVRUSB2
tristate "Hauppauge WinTV-PVR USB2 support"
depends on VIDEO_V4L2 && I2C
depends on VIDEO_MEDIA # Avoids pvrusb = Y / DVB = M
- depends on HOTPLUG # due to FW_LOADER
- select FW_LOADER
select VIDEO_TUNER
select VIDEO_TVEEPROM
select VIDEO_CX2341X
OpenPOWER on IntegriCloud