include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit...

[safe/jmp/linux-2.6] / drivers / media / dvb / frontends / stb0899_drv.c

diff --git a/drivers/media/dvb/frontends/stb0899_drv.c b/drivers/media/dvb/frontends/stb0899_drv.c
index 8a329d6..8e38fce 100644 (file)
--- a/drivers/media/dvb/frontends/stb0899_drv.c
+++ b/drivers/media/dvb/frontends/stb0899_drv.c
@@ -22,6 +22,7 @@
 #include <linux/init.h>
 #include <linux/kernel.h>
 #include <linux/module.h>
+#include <linux/slab.h>
 #include <linux/string.h>
 
 #include <linux/dvb/frontend.h>
@@ -134,7 +135,7 @@ static const struct stb0899_tab stb0899_dvbs2rf_tab[] = {
 };
 
 /* DVB-S2 Es/N0 quant in dB/100 vs read value * 100*/
-struct stb0899_tab stb0899_quant_tab[] = {
+static struct stb0899_tab stb0899_quant_tab[] = {
        {    0,     0 },
        {    0,   100 },
        {  600,   200 },
@@ -177,7 +178,7 @@ struct stb0899_tab stb0899_quant_tab[] = {
 };
 
 /* DVB-S2 Es/N0 estimate in dB/100 vs read value */
-struct stb0899_tab stb0899_est_tab[] = {
+static struct stb0899_tab stb0899_est_tab[] = {
        {    0,      0 },
        {    0,      1 },
        {  301,      2 },
@@ -217,7 +218,7 @@ struct stb0899_tab stb0899_est_tab[] = {
        { 5721, 526017 },
 };
 
-int _stb0899_read_reg(struct stb0899_state *state, unsigned int reg)
+static int _stb0899_read_reg(struct stb0899_state *state, unsigned int reg)
 {
        int ret;
 
@@ -272,9 +273,9 @@ int stb0899_read_reg(struct stb0899_state *state, unsigned int reg)
 }
 
 u32 _stb0899_read_s2reg(struct stb0899_state *state,
-                       u32 stb0899_i2cdev,
-                       u32 stb0899_base_addr,
-                       u16 stb0899_reg_offset)
+                       u32 stb0899_i2cdev,
+                       u32 stb0899_base_addr,
+                       u16 stb0899_reg_offset)
 {
        int status;
        u32 data;
@@ -794,7 +795,7 @@ static int stb0899_send_diseqc_burst(struct dvb_frontend *fe, fe_sec_mini_cmd_t
        reg = stb0899_read_reg(state, STB0899_DISCNTRL1);
        old_state = reg;
        /* set to burst mode    */
-       STB0899_SETFIELD_VAL(DISEQCMODE, reg, 0x02);
+       STB0899_SETFIELD_VAL(DISEQCMODE, reg, 0x03);
        STB0899_SETFIELD_VAL(DISPRECHARGE, reg, 0x01);
        stb0899_write_reg(state, STB0899_DISCNTRL1, reg);
        switch (burst) {
@@ -1571,7 +1572,7 @@ static enum dvbfe_search stb0899_search(struct dvb_frontend *fe, struct dvb_fron
  * stb0899_track
  * periodically check the signal level against a specified
  * threshold level and perform derotator centering.
- * called once we have a lock from a succesful search
+ * called once we have a lock from a successful search
  * event.
  *
  * Will be called periodically called to maintain the
@@ -1618,6 +1619,7 @@ static struct dvb_frontend_ops stb0899_ops = {
 
                .caps                   = FE_CAN_INVERSION_AUTO |
                                          FE_CAN_FEC_AUTO       |
+                                         FE_CAN_2G_MODULATION  |
                                          FE_CAN_QPSK
        },
 
@@ -1637,7 +1639,6 @@ static struct dvb_frontend_ops stb0899_ops = {
        .read_status                    = stb0899_read_status,
        .read_snr                       = stb0899_read_snr,
        .read_signal_strength           = stb0899_read_signal_strength,
-       .read_status                    = stb0899_read_status,
        .read_ber                       = stb0899_read_ber,
 
        .set_voltage                    = stb0899_set_voltage,