From c69330298f91509365ba3247506aa51284dafb85 Mon Sep 17 00:00:00 2001 From: Hans Verkuil Date: Sat, 21 Jun 2008 13:25:36 -0300 Subject: [PATCH] --- yaml --- r: 103854 b: refs/heads/master c: fdea5d69c1d335a639e39e83990de84e10fb2057 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/media/video/cx18/cx18-cards.h | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 3b7babcc997a..1e868fee236e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3d66c405708ee43b08788e89dbd63ebf3bbb5af1 +refs/heads/master: fdea5d69c1d335a639e39e83990de84e10fb2057 diff --git a/trunk/drivers/media/video/cx18/cx18-cards.h b/trunk/drivers/media/video/cx18/cx18-cards.h index b5f894c0afa9..dc283d756907 100644 --- a/trunk/drivers/media/video/cx18/cx18-cards.h +++ b/trunk/drivers/media/video/cx18/cx18-cards.h @@ -85,7 +85,7 @@ struct cx18_gpio_i2c_slave_reset { int msecs_recovery; /* time after deassert for chips to be ready */ }; -struct ivtv_gpio_audio_input { /* select tuner/line in input */ +struct cx18_gpio_audio_input { /* select tuner/line in input */ u32 mask; /* leave to 0 if not supported */ u32 tuner; u32 linein; @@ -130,7 +130,7 @@ struct cx18_card { u8 xceive_pin; /* XCeive tuner GPIO reset pin */ struct cx18_gpio_init gpio_init; struct cx18_gpio_i2c_slave_reset gpio_i2c_slave_reset; - struct ivtv_gpio_audio_input gpio_audio_input; + struct cx18_gpio_audio_input gpio_audio_input; struct cx18_card_tuner tuners[CX18_CARD_MAX_TUNERS]; struct cx18_card_tuner_i2c *i2c;