diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-05-24 01:32:42 -0400 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-05-24 01:32:42 -0400 |
| commit | 26e27cd424554202d36f38ee35421143788da127 (patch) | |
| tree | 04d068c76af5b636c061173465faa574d4b5e7b0 /drivers/media/dvb/pluto2/Kconfig | |
| parent | b74ba22f030eb7ab88f7d8954ad18ecc0ac5ce3c (diff) | |
| parent | 387e2b0439026aa738a9edca15a57e5c0bcb4dfc (diff) | |
Merge branch 'master' into upstream
Diffstat (limited to 'drivers/media/dvb/pluto2/Kconfig')
| -rw-r--r-- | drivers/media/dvb/pluto2/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/dvb/pluto2/Kconfig b/drivers/media/dvb/pluto2/Kconfig index 84f8f9f52869..48252e9ce586 100644 --- a/drivers/media/dvb/pluto2/Kconfig +++ b/drivers/media/dvb/pluto2/Kconfig | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | config DVB_PLUTO2 | 1 | config DVB_PLUTO2 |
| 2 | tristate "Pluto2 cards" | 2 | tristate "Pluto2 cards" |
| 3 | depends on DVB_CORE && PCI | 3 | depends on DVB_CORE && PCI && I2C |
| 4 | select I2C | 4 | select I2C |
| 5 | select I2C_ALGOBIT | 5 | select I2C_ALGOBIT |
| 6 | select DVB_TDA1004X | 6 | select DVB_TDA1004X |