---

yaml --- r: 124195 b: refs/heads/master c: 6676792 h: refs/heads/master i: 124193: e513a3b 124191: 7855f95 v: v3
git-mirror · Dec 29, 2008 · 1da5d12 · 1da5d12
1 parent 8ceab2b
commit 1da5d12
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 1 deletion.
diff --git 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
@@ -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
@@ -288,6 +288,7 @@ struct em28xx_board {
 	char *name;
 	int vchannels;
 	int tuner_type;
+	int tuner_addr;
 
 	/* i2c flags */
 	unsigned int tda9887_conf;