summaryrefslogtreecommitdiff
path: root/linux/drivers/media/video/bt8xx/bttvp.h
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@infradead.org>2006-12-12 07:56:36 -0200
committerMauro Carvalho Chehab <mchehab@infradead.org>2006-12-12 07:56:36 -0200
commit773e7292f316da46fb1080a50f93487e71c08e07 (patch)
treebdf0bad929edf24c9765b34b06bfb8f88776488e /linux/drivers/media/video/bt8xx/bttvp.h
parentfad351a077326df1edcb5e3b19ea19cd146785e3 (diff)
parent0cdc4cbc7bfa18160b5bac7c37525cbd904b84eb (diff)
downloadmediapointer-dvb-s2-773e7292f316da46fb1080a50f93487e71c08e07.tar.gz
mediapointer-dvb-s2-773e7292f316da46fb1080a50f93487e71c08e07.tar.bz2
merge: http://linuxtv.org/hg/~hhackmann/v4l-dvb
From: Mauro Carvalho Chehab <mchehab@infradead.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'linux/drivers/media/video/bt8xx/bttvp.h')
-rw-r--r--linux/drivers/media/video/bt8xx/bttvp.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/linux/drivers/media/video/bt8xx/bttvp.h b/linux/drivers/media/video/bt8xx/bttvp.h
index 43526b073..70f9f879c 100644
--- a/linux/drivers/media/video/bt8xx/bttvp.h
+++ b/linux/drivers/media/video/bt8xx/bttvp.h
@@ -322,7 +322,7 @@ struct bttv {
/* infrared remote */
int has_remote;
- struct bttv_ir *remote;
+ struct card_ir *remote;
/* locking */
spinlock_t s_lock;