val = s5h1409_readreg(state, 0xac) & 0xcfff;
        switch (mode) {
-       case S5H1409_MPEGTIMING_CONTINOUS_INVERTING_CLOCK:
+       case S5H1409_MPEGTIMING_CONTINUOUS_INVERTING_CLOCK:
                val |= 0x0000;
                break;
-       case S5H1409_MPEGTIMING_CONTINOUS_NONINVERTING_CLOCK:
+       case S5H1409_MPEGTIMING_CONTINUOUS_NONINVERTING_CLOCK:
                dprintk("%s(%d) Mode1 or Defaulting\n", __func__, mode);
                val |= 0x1000;
                break;
-       case S5H1409_MPEGTIMING_NONCONTINOUS_INVERTING_CLOCK:
+       case S5H1409_MPEGTIMING_NONCONTINUOUS_INVERTING_CLOCK:
                val |= 0x2000;
                break;
-       case S5H1409_MPEGTIMING_NONCONTINOUS_NONINVERTING_CLOCK:
+       case S5H1409_MPEGTIMING_NONCONTINUOUS_NONINVERTING_CLOCK:
                val |= 0x3000;
                break;
        default:
 
        u8 status_mode;
 
        /* MPEG signal timing */
-#define S5H1409_MPEGTIMING_CONTINOUS_INVERTING_CLOCK       0
-#define S5H1409_MPEGTIMING_CONTINOUS_NONINVERTING_CLOCK    1
-#define S5H1409_MPEGTIMING_NONCONTINOUS_INVERTING_CLOCK    2
-#define S5H1409_MPEGTIMING_NONCONTINOUS_NONINVERTING_CLOCK 3
+#define S5H1409_MPEGTIMING_CONTINUOUS_INVERTING_CLOCK       0
+#define S5H1409_MPEGTIMING_CONTINUOUS_NONINVERTING_CLOCK    1
+#define S5H1409_MPEGTIMING_NONCONTINUOUS_INVERTING_CLOCK    2
+#define S5H1409_MPEGTIMING_NONCONTINUOUS_NONINVERTING_CLOCK 3
        u16 mpeg_timing;
 
        /* HVR-1600 optimizations (to better work with MXL5005s)
 
 
        val = s5h1411_readreg(state, S5H1411_I2C_TOP_ADDR, 0xbe) & 0xcfff;
        switch (mode) {
-       case S5H1411_MPEGTIMING_CONTINOUS_INVERTING_CLOCK:
+       case S5H1411_MPEGTIMING_CONTINUOUS_INVERTING_CLOCK:
                val |= 0x0000;
                break;
-       case S5H1411_MPEGTIMING_CONTINOUS_NONINVERTING_CLOCK:
+       case S5H1411_MPEGTIMING_CONTINUOUS_NONINVERTING_CLOCK:
                dprintk("%s(%d) Mode1 or Defaulting\n", __func__, mode);
                val |= 0x1000;
                break;
-       case S5H1411_MPEGTIMING_NONCONTINOUS_INVERTING_CLOCK:
+       case S5H1411_MPEGTIMING_NONCONTINUOUS_INVERTING_CLOCK:
                val |= 0x2000;
                break;
-       case S5H1411_MPEGTIMING_NONCONTINOUS_NONINVERTING_CLOCK:
+       case S5H1411_MPEGTIMING_NONCONTINUOUS_NONINVERTING_CLOCK:
                val |= 0x3000;
                break;
        default:
 
        u8 gpio;
 
        /* MPEG signal timing */
-#define S5H1411_MPEGTIMING_CONTINOUS_INVERTING_CLOCK       0
-#define S5H1411_MPEGTIMING_CONTINOUS_NONINVERTING_CLOCK    1
-#define S5H1411_MPEGTIMING_NONCONTINOUS_INVERTING_CLOCK    2
-#define S5H1411_MPEGTIMING_NONCONTINOUS_NONINVERTING_CLOCK 3
+#define S5H1411_MPEGTIMING_CONTINUOUS_INVERTING_CLOCK       0
+#define S5H1411_MPEGTIMING_CONTINUOUS_NONINVERTING_CLOCK    1
+#define S5H1411_MPEGTIMING_NONCONTINUOUS_INVERTING_CLOCK    2
+#define S5H1411_MPEGTIMING_NONCONTINUOUS_NONINVERTING_CLOCK 3
        u16 mpeg_timing;
 
        /* IF Freq for QAM and VSB in KHz */
 
        u8 gpio;
 
        /* MPEG signal timing */
-#define S5H1432_MPEGTIMING_CONTINOUS_INVERTING_CLOCK       0
-#define S5H1432_MPEGTIMING_CONTINOUS_NONINVERTING_CLOCK    1
-#define S5H1432_MPEGTIMING_NONCONTINOUS_INVERTING_CLOCK    2
-#define S5H1432_MPEGTIMING_NONCONTINOUS_NONINVERTING_CLOCK 3
+#define S5H1432_MPEGTIMING_CONTINUOUS_INVERTING_CLOCK       0
+#define S5H1432_MPEGTIMING_CONTINUOUS_NONINVERTING_CLOCK    1
+#define S5H1432_MPEGTIMING_NONCONTINUOUS_INVERTING_CLOCK    2
+#define S5H1432_MPEGTIMING_NONCONTINUOUS_NONINVERTING_CLOCK 3
        u16 mpeg_timing;
 
        /* IF Freq for QAM and VSB in KHz */
 
        .qam_if        = 44000,
        .inversion     = S5H1409_INVERSION_OFF,
        .status_mode   = S5H1409_DEMODLOCKING,
-       .mpeg_timing   = S5H1409_MPEGTIMING_CONTINOUS_NONINVERTING_CLOCK,
+       .mpeg_timing   = S5H1409_MPEGTIMING_CONTINUOUS_NONINVERTING_CLOCK,
        .hvr1600_opt   = S5H1409_HVR1600_OPTIMIZE
 };
 
        .qam_if        = S5H1411_IF_4000,
        .inversion     = S5H1411_INVERSION_ON,
        .status_mode   = S5H1411_DEMODLOCKING,
-       .mpeg_timing   = S5H1411_MPEGTIMING_CONTINOUS_NONINVERTING_CLOCK,
+       .mpeg_timing   = S5H1411_MPEGTIMING_CONTINUOUS_NONINVERTING_CLOCK,
 };
 
 static struct tda18271_std_map hauppauge_tda18271_std_map = {
 
        .qam_if        = 44000,
        .inversion     = S5H1409_INVERSION_OFF,
        .status_mode   = S5H1409_DEMODLOCKING,
-       .mpeg_timing   = S5H1409_MPEGTIMING_CONTINOUS_NONINVERTING_CLOCK,
+       .mpeg_timing   = S5H1409_MPEGTIMING_CONTINUOUS_NONINVERTING_CLOCK,
 };
 
 static struct tda10048_config hauppauge_hvr1200_config = {
        .qam_if        = 4000,
        .inversion     = S5H1409_INVERSION_ON,
        .status_mode   = S5H1409_DEMODLOCKING,
-       .mpeg_timing   = S5H1409_MPEGTIMING_CONTINOUS_NONINVERTING_CLOCK,
+       .mpeg_timing   = S5H1409_MPEGTIMING_CONTINUOUS_NONINVERTING_CLOCK,
 };
 
 static struct s5h1409_config hauppauge_hvr1800lp_config = {
        .qam_if        = 44000,
        .inversion     = S5H1409_INVERSION_OFF,
        .status_mode   = S5H1409_DEMODLOCKING,
-       .mpeg_timing   = S5H1409_MPEGTIMING_CONTINOUS_NONINVERTING_CLOCK,
+       .mpeg_timing   = S5H1409_MPEGTIMING_CONTINUOUS_NONINVERTING_CLOCK,
 };
 
 static struct s5h1409_config hauppauge_hvr1500_config = {
        .gpio          = S5H1409_GPIO_OFF,
        .inversion     = S5H1409_INVERSION_OFF,
        .status_mode   = S5H1409_DEMODLOCKING,
-       .mpeg_timing   = S5H1409_MPEGTIMING_CONTINOUS_NONINVERTING_CLOCK,
+       .mpeg_timing   = S5H1409_MPEGTIMING_CONTINUOUS_NONINVERTING_CLOCK,
 };
 
 static struct mt2131_config hauppauge_generic_tunerconfig = {
        .qam_if        = 44000,
        .inversion     = S5H1409_INVERSION_OFF,
        .status_mode   = S5H1409_DEMODLOCKING,
-       .mpeg_timing   = S5H1409_MPEGTIMING_CONTINOUS_NONINVERTING_CLOCK,
+       .mpeg_timing   = S5H1409_MPEGTIMING_CONTINUOUS_NONINVERTING_CLOCK,
 };
 
 static struct s5h1409_config dvico_s5h1409_config = {
        .qam_if        = 44000,
        .inversion     = S5H1409_INVERSION_OFF,
        .status_mode   = S5H1409_DEMODLOCKING,
-       .mpeg_timing   = S5H1409_MPEGTIMING_CONTINOUS_NONINVERTING_CLOCK,
+       .mpeg_timing   = S5H1409_MPEGTIMING_CONTINUOUS_NONINVERTING_CLOCK,
 };
 
 static struct s5h1411_config dvico_s5h1411_config = {
        .vsb_if        = S5H1411_IF_44000,
        .inversion     = S5H1411_INVERSION_OFF,
        .status_mode   = S5H1411_DEMODLOCKING,
-       .mpeg_timing   = S5H1411_MPEGTIMING_CONTINOUS_NONINVERTING_CLOCK,
+       .mpeg_timing   = S5H1411_MPEGTIMING_CONTINUOUS_NONINVERTING_CLOCK,
 };
 
 static struct s5h1411_config hcw_s5h1411_config = {
        .qam_if        = S5H1411_IF_4000,
        .inversion     = S5H1411_INVERSION_ON,
        .status_mode   = S5H1411_DEMODLOCKING,
-       .mpeg_timing   = S5H1411_MPEGTIMING_CONTINOUS_NONINVERTING_CLOCK,
+       .mpeg_timing   = S5H1411_MPEGTIMING_CONTINUOUS_NONINVERTING_CLOCK,
 };
 
 static struct xc5000_config hauppauge_hvr1500q_tunerconfig = {
 
        .qam_if        = 44000,
        .inversion     = S5H1409_INVERSION_OFF,
        .status_mode   = S5H1409_DEMODLOCKING,
-       .mpeg_timing   = S5H1409_MPEGTIMING_NONCONTINOUS_NONINVERTING_CLOCK,
+       .mpeg_timing   = S5H1409_MPEGTIMING_NONCONTINUOUS_NONINVERTING_CLOCK,
 };
 
 static const struct s5h1409_config dvico_hdtv5_pci_nano_config = {
        .gpio          = S5H1409_GPIO_OFF,
        .inversion     = S5H1409_INVERSION_OFF,
        .status_mode   = S5H1409_DEMODLOCKING,
-       .mpeg_timing   = S5H1409_MPEGTIMING_CONTINOUS_NONINVERTING_CLOCK,
+       .mpeg_timing   = S5H1409_MPEGTIMING_CONTINUOUS_NONINVERTING_CLOCK,
 };
 
 static const struct s5h1409_config kworld_atsc_120_config = {
        .gpio          = S5H1409_GPIO_OFF,
        .inversion     = S5H1409_INVERSION_OFF,
        .status_mode   = S5H1409_DEMODLOCKING,
-       .mpeg_timing   = S5H1409_MPEGTIMING_CONTINOUS_NONINVERTING_CLOCK,
+       .mpeg_timing   = S5H1409_MPEGTIMING_CONTINUOUS_NONINVERTING_CLOCK,
 };
 
 static const struct xc5000_config pinnacle_pctv_hd_800i_tuner_config = {
 static const struct s5h1411_config dvico_fusionhdtv7_config = {
        .output_mode   = S5H1411_SERIAL_OUTPUT,
        .gpio          = S5H1411_GPIO_ON,
-       .mpeg_timing   = S5H1411_MPEGTIMING_CONTINOUS_NONINVERTING_CLOCK,
+       .mpeg_timing   = S5H1411_MPEGTIMING_CONTINUOUS_NONINVERTING_CLOCK,
        .qam_if        = S5H1411_IF_44000,
        .vsb_if        = S5H1411_IF_44000,
        .inversion     = S5H1411_INVERSION_OFF,
 
        .inversion     = S5H1411_INVERSION_ON,
        .status_mode   = S5H1411_DEMODLOCKING,
        .mpeg_timing   =
-               S5H1411_MPEGTIMING_CONTINOUS_NONINVERTING_CLOCK,
+               S5H1411_MPEGTIMING_CONTINUOUS_NONINVERTING_CLOCK,
 };
 
 
 
        .vsb_if        = S5H1411_IF_3250,
        .inversion     = S5H1411_INVERSION_ON,
        .status_mode   = S5H1411_DEMODLOCKING,
-       .mpeg_timing   = S5H1411_MPEGTIMING_CONTINOUS_NONINVERTING_CLOCK,
+       .mpeg_timing   = S5H1411_MPEGTIMING_CONTINUOUS_NONINVERTING_CLOCK,
 };
 
 static struct lgdt3306a_config hauppauge_hvr2255a_config = {
 
        .vsb_if        = S5H1432_IF_4000,
        .inversion     = S5H1432_INVERSION_OFF,
        .status_mode   = S5H1432_DEMODLOCKING,
-       .mpeg_timing   = S5H1432_MPEGTIMING_CONTINOUS_NONINVERTING_CLOCK,
+       .mpeg_timing   = S5H1432_MPEGTIMING_CONTINUOUS_NONINVERTING_CLOCK,
 };
 
 static struct tda18271_std_map cnxt_rde253s_tda18271_std_map = {
        .qam_if        = S5H1411_IF_4000,
        .inversion     = S5H1411_INVERSION_ON,
        .status_mode   = S5H1411_DEMODLOCKING,
-       .mpeg_timing   = S5H1411_MPEGTIMING_CONTINOUS_NONINVERTING_CLOCK,
+       .mpeg_timing   = S5H1411_MPEGTIMING_CONTINUOUS_NONINVERTING_CLOCK,
 };
 static struct s5h1411_config xc5000_s5h1411_config = {
        .output_mode   = S5H1411_SERIAL_OUTPUT,
        .qam_if        = S5H1411_IF_3250,
        .inversion     = S5H1411_INVERSION_OFF,
        .status_mode   = S5H1411_DEMODLOCKING,
-       .mpeg_timing   = S5H1411_MPEGTIMING_CONTINOUS_NONINVERTING_CLOCK,
+       .mpeg_timing   = S5H1411_MPEGTIMING_CONTINUOUS_NONINVERTING_CLOCK,
 };
 
 static struct lgdt3305_config hcw_lgdt3305_config = {
 
 static struct s5h1411_config pinnacle_801e_config = {
        .output_mode   = S5H1411_PARALLEL_OUTPUT,
        .gpio          = S5H1411_GPIO_OFF,
-       .mpeg_timing   = S5H1411_MPEGTIMING_NONCONTINOUS_NONINVERTING_CLOCK,
+       .mpeg_timing   = S5H1411_MPEGTIMING_NONCONTINUOUS_NONINVERTING_CLOCK,
        .qam_if        = S5H1411_IF_44000,
        .vsb_if        = S5H1411_IF_44000,
        .inversion     = S5H1411_INVERSION_OFF,
 
        .gpio          = S5H1409_GPIO_OFF,
        .inversion     = S5H1409_INVERSION_OFF,
        .status_mode   = S5H1409_DEMODLOCKING,
-       .mpeg_timing   = S5H1409_MPEGTIMING_CONTINOUS_NONINVERTING_CLOCK
+       .mpeg_timing   = S5H1409_MPEGTIMING_CONTINUOUS_NONINVERTING_CLOCK
 };
 
 static struct tda18271_std_map kworld_a340_std_map = {