aboutsummaryrefslogtreecommitdiff
path: root/drivers/media/dvb/dvb-usb/digitv.c
diff options
context:
space:
mode:
authorJody McIntyre <scjody@modernduck.com>2005-12-05 15:52:41 -0500
committerJody McIntyre <scjody@modernduck.com>2005-12-05 15:52:41 -0500
commitc4fc108a8275f5eb77c9859725643a6870d20ef6 (patch)
treede7ce4af8e49ad2504fc270594124ec8ec874857 /drivers/media/dvb/dvb-usb/digitv.c
parent741854e4f9a23421e194df8d846899172ff393d6 (diff)
parente4f5c82a92c2a546a16af1614114eec19120e40a (diff)
Merge with http://kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Diffstat (limited to 'drivers/media/dvb/dvb-usb/digitv.c')
-rw-r--r--drivers/media/dvb/dvb-usb/digitv.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/dvb/dvb-usb/digitv.c b/drivers/media/dvb/dvb-usb/digitv.c
index 74545f82eff..f98e306a575 100644
--- a/drivers/media/dvb/dvb-usb/digitv.c
+++ b/drivers/media/dvb/dvb-usb/digitv.c
@@ -148,7 +148,7 @@ static struct dvb_usb_rc_key digitv_rc_keys[] = {
};
/* TODO is it really the NEC protocol ? */
-int digitv_rc_query(struct dvb_usb_device *d, u32 *event, int *state)
+static int digitv_rc_query(struct dvb_usb_device *d, u32 *event, int *state)
{
u8 key[5];