From 4709e422f8326c3a0a4d92f0f8c034e452bf1eee Mon Sep 17 00:00:00 2001 From: Ruslan Pisarev Date: Wed, 20 Oct 2010 06:35:34 -0300 Subject: [PATCH] --- yaml --- r: 219468 b: refs/heads/master c: 40004e24c489cbeea9089a35530b553834391bf1 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/staging/tm6000/tm6000.h | 9 +++++---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index a10d2e765454..0290f29dcff1 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 51a5d39610f433f282985bcba18b90c2791c2669 +refs/heads/master: 40004e24c489cbeea9089a35530b553834391bf1 diff --git a/trunk/drivers/staging/tm6000/tm6000.h b/trunk/drivers/staging/tm6000/tm6000.h index f87e4c8f632b..46017b603190 100644 --- a/trunk/drivers/staging/tm6000/tm6000.h +++ b/trunk/drivers/staging/tm6000/tm6000.h @@ -54,8 +54,9 @@ enum tm6000_devtype { }; /* ------------------------------------------------------------------ - Basic structures - ------------------------------------------------------------------*/ + * Basic structures + * ------------------------------------------------------------------ + */ struct tm6000_fmt { char *name; @@ -256,9 +257,9 @@ struct tm6000_fh { enum v4l2_buf_type type; }; -#define TM6000_STD V4L2_STD_PAL|V4L2_STD_PAL_N|V4L2_STD_PAL_Nc| \ +#define TM6000_STD (V4L2_STD_PAL|V4L2_STD_PAL_N|V4L2_STD_PAL_Nc| \ V4L2_STD_PAL_M|V4L2_STD_PAL_60|V4L2_STD_NTSC_M| \ - V4L2_STD_NTSC_M_JP|V4L2_STD_SECAM + V4L2_STD_NTSC_M_JP|V4L2_STD_SECAM) /* In tm6000-cards.c */