diff options
| author | David Woodhouse <dwmw2@infradead.org> | 2006-05-24 04:22:21 -0400 |
|---|---|---|
| committer | David Woodhouse <dwmw2@infradead.org> | 2006-05-24 04:22:21 -0400 |
| commit | 66643de455c27973ac31ad6de9f859d399916842 (patch) | |
| tree | 7ebed7f051879007d4b11d6aaa9e65a1bcb0b08f /drivers/media/dvb/pluto2/Kconfig | |
| parent | 2c23d62abb820e19c54012520f08a198c2233a85 (diff) | |
| parent | 387e2b0439026aa738a9edca15a57e5c0bcb4dfc (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Conflicts:
include/asm-powerpc/unistd.h
include/asm-sparc/unistd.h
include/asm-sparc64/unistd.h
Signed-off-by: David Woodhouse <dwmw2@infradead.org>
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 |