From 1a1853491fb68338c50d39df06670a4c21a9ba1f Mon Sep 17 00:00:00 2001 From: Tobias Klauser Date: Tue, 22 Apr 2008 14:45:45 -0300 Subject: [PATCH] --- yaml --- r: 92457 b: refs/heads/master c: ebff033039b654b7b5493499babe22c7c1b0d36e h: refs/heads/master i: 92455: 7fc43f10ae5a8b9836b6298e9c80d4710f261ff0 v: v3 --- [refs] | 2 +- trunk/drivers/media/video/pvrusb2/pvrusb2-hdw.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index bd534c7131a0..42c9b8a51231 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 794b16072e00d0a40a8c773dd4319fb1e460a632 +refs/heads/master: ebff033039b654b7b5493499babe22c7c1b0d36e diff --git a/trunk/drivers/media/video/pvrusb2/pvrusb2-hdw.c b/trunk/drivers/media/video/pvrusb2/pvrusb2-hdw.c index 7e7c570cf830..8bdb807b19b8 100644 --- a/trunk/drivers/media/video/pvrusb2/pvrusb2-hdw.c +++ b/trunk/drivers/media/video/pvrusb2/pvrusb2-hdw.c @@ -1502,7 +1502,7 @@ struct pvr2_std_hack { default - which can always be overridden explicitly - and if the user has otherwise named a default then that default will always be used in place of this table. */ -const static struct pvr2_std_hack std_eeprom_maps[] = { +static const struct pvr2_std_hack std_eeprom_maps[] = { { /* PAL(B/G) */ .pat = V4L2_STD_B|V4L2_STD_GH, .std = V4L2_STD_PAL_B|V4L2_STD_PAL_B1|V4L2_STD_PAL_G, @@ -3695,7 +3695,7 @@ static int state_update_pipeline_state(struct pvr2_hdw *hdw) typedef int (*state_eval_func)(struct pvr2_hdw *); /* Set of functions to be run to evaluate various states in the driver. */ -const static state_eval_func eval_funcs[] = { +static const state_eval_func eval_funcs[] = { state_eval_pathway_ok, state_eval_pipeline_config, state_eval_encoder_ok,