diff --git a/[refs] b/[refs] index b16f7b47c485..a2851e4d12d6 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: bb0c2fe0c423d6501395e626501dd8747823cafb +refs/heads/master: 694dca2b80d5e17f5edddacf4fcdacc1091623f2 diff --git a/trunk/drivers/media/video/pvrusb2/pvrusb2-hdw.c b/trunk/drivers/media/video/pvrusb2/pvrusb2-hdw.c index b711328400e1..195e974f5eb0 100644 --- a/trunk/drivers/media/video/pvrusb2/pvrusb2-hdw.c +++ b/trunk/drivers/media/video/pvrusb2/pvrusb2-hdw.c @@ -216,12 +216,12 @@ static const char *pvr2_state_names[] = { }; -struct pvr2_fx2cmd_desc { +struct pvr2_fx2cmd_descdef { unsigned char id; unsigned char *desc; }; -static const struct pvr2_fx2cmd_desc pvr2_fx2cmd_desc[] = { +static const struct pvr2_fx2cmd_descdef pvr2_fx2cmd_desc[] = { {FX2CMD_MEM_WRITE_DWORD, "write encoder dword"}, {FX2CMD_MEM_READ_DWORD, "read encoder dword"}, {FX2CMD_MEM_READ_64BYTES, "read encoder 64bytes"},