diff options
author | Thomas Gleixner <tglx@linutronix.de> | 2008-05-17 10:01:05 -0400 |
---|---|---|
committer | Thomas Gleixner <tglx@linutronix.de> | 2008-05-17 10:01:05 -0400 |
commit | 0e50a4c6ab94ffe7e5515b86b5df9e5abc8c6b13 (patch) | |
tree | 3c688483e71261f564fc43be3157b337ae340dca /drivers/media/dvb/cinergyT2 | |
parent | 34b2cd5b688b012975fcfc3b3970fc3508fa82c4 (diff) | |
parent | f26a3988917913b3d11b2bd741601a2c64ab9204 (diff) |
Merge branch 'linus' into x86/pebs
Diffstat (limited to 'drivers/media/dvb/cinergyT2')
-rw-r--r-- | drivers/media/dvb/cinergyT2/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/dvb/cinergyT2/Kconfig b/drivers/media/dvb/cinergyT2/Kconfig index 3d778c5aba68..c03513b2ccae 100644 --- a/drivers/media/dvb/cinergyT2/Kconfig +++ b/drivers/media/dvb/cinergyT2/Kconfig | |||
@@ -1,6 +1,6 @@ | |||
1 | config DVB_CINERGYT2 | 1 | config DVB_CINERGYT2 |
2 | tristate "Terratec CinergyT2/qanu USB2 DVB-T receiver" | 2 | tristate "Terratec CinergyT2/qanu USB2 DVB-T receiver" |
3 | depends on DVB_CORE && USB | 3 | depends on DVB_CORE && USB && INPUT |
4 | help | 4 | help |
5 | Support for "TerraTec CinergyT2" USB2.0 Highspeed DVB Receivers | 5 | Support for "TerraTec CinergyT2" USB2.0 Highspeed DVB Receivers |
6 | 6 | ||