diff options
| author |   Paul Mackerras <paulus@samba.org> | 2008-06-09 12:19:41 +1000 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2008-06-09 12:19:41 +1000 |
| commit | 8a3e1c670e503ddd6f6c373b307f38b783ee3a50 (patch) | |
| tree | 03094e8425b750d2693a271ebc89b49312e5476a /drivers/media/dvb/dvb-usb/Kconfig | |
| parent | [POWERPC] fsl: Update fsl_soc to use cell-index property of I2C nodes (diff) | |
| parent | [POWERPC] ehea: Remove dependency on MEMORY_HOTPLUG (diff) | |
| download | linux-dev-8a3e1c670e503ddd6f6c373b307f38b783ee3a50.tar.xz linux-dev-8a3e1c670e503ddd6f6c373b307f38b783ee3a50.zip | |
Merge branch 'merge'
Conflicts:
arch/powerpc/sysdev/fsl_soc.c
Diffstat (limited to 'drivers/media/dvb/dvb-usb/Kconfig')
| -rw-r--r-- | drivers/media/dvb/dvb-usb/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/dvb/dvb-usb/Kconfig b/drivers/media/dvb/dvb-usb/Kconfig index cf4584e48b6d..f00a0eb40420 100644 --- a/drivers/media/dvb/dvb-usb/Kconfig +++ b/drivers/media/dvb/dvb-usb/Kconfig @@ -1,6 +1,6 @@ config DVB_USB tristate "Support for various USB DVB devices" - depends on DVB_CORE && USB && I2C + depends on DVB_CORE && USB && I2C && INPUT depends on HOTPLUG # due to FW_LOADER select FW_LOADER help |