[PATCH] dvb: frontends: misc. minor cleanups

misc. minor cleanups, select FW_LOADER and add a help text to DVB_OR51132

Signed-off-by: Johannes Stezenbach <js@linuxtv.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

diff --git a/drivers/media/dvb/frontends/Kconfig b/drivers/media/dvb/frontends/Kconfig
index 0bfd4df17d08d4775a58539e74a22c52892e35a6..75fb556ec01fe32b99d4f7c06d4ea50de758646d 100644 (file)
--- a/drivers/media/dvb/frontends/Kconfig
+++ b/drivers/media/dvb/frontends/Kconfig
@@ -12,10 +12,10 @@ config DVB_STV0299
 
 config DVB_CX24110
        tristate "Conexant CX24110 based"
-       depends on DVB_CORE
-       help
+       depends on DVB_CORE
+       help
          A DVB-S tuner module. Say Y when you want to support this frontend.
- 
+
 config DVB_TDA8083
        tristate "Philips TDA8083 based"
        depends on DVB_CORE
@@ -127,8 +127,8 @@ comment "DVB-C (cable) frontends"
 config DVB_ATMEL_AT76C651
        tristate "Atmel AT76C651 based"
        depends on DVB_CORE
-        help
-         A DVB-C tuner module. Say Y when you want to support this frontend.
+       help
+         A DVB-C tuner module. Say Y when you want to support this frontend.
 
 config DVB_VES1820
        tristate "VLSI VES1820 based"
@@ -158,10 +158,6 @@ config DVB_NXT2002
        help
          An ATSC 8VSB tuner module. Say Y when you want to support this frontend.
 
-config DVB_OR51132
-       tristate "OR51132 based (pcHDTV)"
-       depends on DVB_CORE
-
 config DVB_OR51211
        tristate "or51211 based (pcHDTV HD2000 card)"
        depends on DVB_CORE
@@ -169,4 +165,12 @@ config DVB_OR51211
        help
          An ATSC 8VSB tuner module. Say Y when you want to support this frontend.
 
+config DVB_OR51132
+       tristate "OR51132 based (pcHDTV HD3000 card)"
+       depends on DVB_CORE
+       select FW_LOADER
+       help
+         An ATSC 8VSB and QAM64/256 tuner module. Say Y when you want
+         to support this frontend.
+
 endmenu

diff --git a/drivers/media/dvb/frontends/mt352.h b/drivers/media/dvb/frontends/mt352.h
index 8bc032f7f5c1131b7708078c762594888553c4f3..03040cd595bb4b50a0a9cb4d1f4835d663705b02 100644 (file)
--- a/drivers/media/dvb/frontends/mt352.h
+++ b/drivers/media/dvb/frontends/mt352.h
@@ -63,9 +63,3 @@ extern struct dvb_frontend* mt352_attach(const struct mt352_config* config,
 extern int mt352_write(struct dvb_frontend* fe, u8* ibuf, int ilen);
 
 #endif // MT352_H
-
-/*
- * Local variables:
- * c-basic-offset: 8
- * End:
- */

diff --git a/drivers/media/dvb/frontends/nxt2002.c b/drivers/media/dvb/frontends/nxt2002.c
index 8805b0f5f619bcc16f77496188fb796144998a4d..35a1d60f19273023ee5cfab5ce276a7aff74d0ce 100644 (file)
--- a/drivers/media/dvb/frontends/nxt2002.c
+++ b/drivers/media/dvb/frontends/nxt2002.c
@@ -343,8 +343,6 @@ static int nxt2002_setup_frontend_parameters (struct dvb_frontend* fe,
        /* reset the agc now that tuning has been completed */
        nxt2002_agc_reset(state);
 
-
-
        /* set target power level */
        switch (p->u.vsb.modulation) {
                case QAM_64:

diff --git a/drivers/media/dvb/frontends/tda80xx.c b/drivers/media/dvb/frontends/tda80xx.c
index 00c145521f4fee43d5a1f6dadeb40bdd32383610..032d348dafb749acfb9144453e8400d8666c42a8 100644 (file)
--- a/drivers/media/dvb/frontends/tda80xx.c
+++ b/drivers/media/dvb/frontends/tda80xx.c
@@ -27,7 +27,7 @@
 #include <linux/spinlock.h>
 #include <linux/threads.h>
 #include <linux/interrupt.h>
-#include <asm/irq.h>
+#include <linux/irq.h>
 #include <linux/kernel.h>
 #include <linux/module.h>
 #include <linux/slab.h>