diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-07-31 12:34:22 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-07-31 12:34:22 -0400 |
| commit | 6679ce6e5f519096612b480d255d9ca97be0c2be (patch) | |
| tree | cce6814d3e7c62adf59e565fb6ae95fd409f86ab /drivers/media/video/cx23885/Kconfig | |
| parent | 2c3d103ba90827cfb478bf10464d9b5b9cea369c (diff) | |
| parent | 6e86841d05f371b5b9b86ce76c02aaee83352298 (diff) | |
Merge branch 'linus' into sched/urgent
Diffstat (limited to 'drivers/media/video/cx23885/Kconfig')
| -rw-r--r-- | drivers/media/video/cx23885/Kconfig | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/media/video/cx23885/Kconfig b/drivers/media/video/cx23885/Kconfig index 5cfb46bbdaa9..e60bd31b51a3 100644 --- a/drivers/media/video/cx23885/Kconfig +++ b/drivers/media/video/cx23885/Kconfig | |||
| @@ -1,9 +1,7 @@ | |||
| 1 | config VIDEO_CX23885 | 1 | config VIDEO_CX23885 |
| 2 | tristate "Conexant cx23885 (2388x successor) support" | 2 | tristate "Conexant cx23885 (2388x successor) support" |
| 3 | depends on DVB_CORE && VIDEO_DEV && PCI && I2C && INPUT | 3 | depends on DVB_CORE && VIDEO_DEV && PCI && I2C && INPUT |
| 4 | depends on HOTPLUG # due to FW_LOADER | ||
| 5 | select I2C_ALGOBIT | 4 | select I2C_ALGOBIT |
| 6 | select FW_LOADER | ||
| 7 | select VIDEO_BTCX | 5 | select VIDEO_BTCX |
| 8 | select VIDEO_TUNER | 6 | select VIDEO_TUNER |
| 9 | select VIDEO_TVEEPROM | 7 | select VIDEO_TVEEPROM |