From 1da5d1229677a7365b1833d95b19fcf4b505ec65 Mon Sep 17 00:00:00 2001
From: Mauro Carvalho Chehab <mchehab@redhat.com>
Date: Sun, 16 Nov 2008 08:05:06 -0300
Subject: [PATCH] --- yaml --- r: 124195 b: refs/heads/master c:
 66767920e3e6532db8afe04f9b2d8e1a9e95cad9 h: refs/heads/master i:   124193:
 e513a3b9edaec0741a817f786ffb02f26eb8e71e   124191:
 7855f95d58e677a6dd22e8ddb8324ea18ecbb4d2 v: v3

---
 [refs]                                          | 2 +-
 trunk/drivers/media/video/em28xx/em28xx-cards.c | 1 +
 trunk/drivers/media/video/em28xx/em28xx.h       | 1 +
 3 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 328e4c965711..8c99b371ebb0 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 60245e858ddb2255d458868be16ba814f6f8d446
+refs/heads/master: 66767920e3e6532db8afe04f9b2d8e1a9e95cad9
diff --git a/trunk/drivers/media/video/em28xx/em28xx-cards.c b/trunk/drivers/media/video/em28xx/em28xx-cards.c
index 75b2af2bf4cf..28f64e0b0b4b 100644
--- a/trunk/drivers/media/video/em28xx/em28xx-cards.c
+++ b/trunk/drivers/media/video/em28xx/em28xx-cards.c
@@ -1765,6 +1765,7 @@ void em28xx_card_setup(struct em28xx *dev)
 	em28xx_set_model(dev);
 
 	dev->tuner_type = em28xx_boards[dev->model].tuner_type;
+	dev->tuner_addr = em28xx_boards[dev->model].tuner_addr;
 
 	/* request some modules */
 	switch (dev->model) {
diff --git a/trunk/drivers/media/video/em28xx/em28xx.h b/trunk/drivers/media/video/em28xx/em28xx.h
index 9ff3c83e63d0..3152d00e548b 100644
--- a/trunk/drivers/media/video/em28xx/em28xx.h
+++ b/trunk/drivers/media/video/em28xx/em28xx.h
@@ -288,6 +288,7 @@ struct em28xx_board {
 	char *name;
 	int vchannels;
 	int tuner_type;
+	int tuner_addr;
 
 	/* i2c flags */
 	unsigned int tda9887_conf;