Merge branch 'x86/prototypes' into x86-v28-for-linus-phase1

[linux-2.6-omap-h63xx.git] / drivers / media / video / cx25840 / Kconfig

diff --git a/drivers/media/video/cx25840/Kconfig b/drivers/media/video/cx25840/Kconfig
index 448f4cd0ce345e67f87c024683d7c6ec81dc2549..de515dadadc2e2062f3c655c2821874675d581f1 100644 (file)
--- a/drivers/media/video/cx25840/Kconfig
+++ b/drivers/media/video/cx25840/Kconfig
@@ -1,8 +1,6 @@
 config VIDEO_CX25840
        tristate "Conexant CX2584x audio/video decoders"
        depends on VIDEO_V4L2 && I2C && EXPERIMENTAL
-       depends on HOTPLUG # due to FW_LOADER
-       select FW_LOADER
        ---help---
          Support for the Conexant CX2584x audio/video decoders.