diff --git a/[refs] b/[refs] index a63851a524c0..b1c7c06ed9d4 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 2ba890ec0849b222a6dabb5192ccd8fd1696d6d3 +refs/heads/master: 7e26ca8012a8392c5e53055b8ff3d9512faee6c6 diff --git a/trunk/drivers/media/video/em28xx/em28xx-cards.c b/trunk/drivers/media/video/em28xx/em28xx-cards.c index 0cf61a502203..cbf6e179acb4 100644 --- a/trunk/drivers/media/video/em28xx/em28xx-cards.c +++ b/trunk/drivers/media/video/em28xx/em28xx-cards.c @@ -436,18 +436,18 @@ MODULE_DEVICE_TABLE(usb, em28xx_id_table); /* Board Hauppauge WinTV HVR 900 analog */ struct em28xx_reg_seq hauppauge_wintv_hvr_900_analog[] = { - { -1, -1, 6}, - {0x08, 0x2d, 10}, - {0x08, 0x3d, 5}, - { -1, -1, -1}, + { -1, -1, 6}, + {EM_R08_GPIO, 0x2d, 10}, + {EM_R08_GPIO, 0x3d, 5}, + { -1, -1, -1}, }; /* Board Hauppauge WinTV HVR 900 digital */ struct em28xx_reg_seq hauppauge_wintv_hvr_900_digital[] = { - { -1, -1, 6}, - {0x08, 0x2e, 6}, - {0x08, 0x3e, 6}, - {0x04, 0x04, 10}, - {0x04, 0x0c, 10}, + { -1, -1, 6}, + {EM_R08_GPIO, 0x2e, 6}, + {EM_R08_GPIO, 0x3e, 6}, + {EM_R04_GPO, 0x04, 10}, + {EM_R04_GPO, 0x0c, 10}, { -1, -1, -1}, };