summaryrefslogtreecommitdiff
path: root/linux/drivers/media/dvb/dvb-usb
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@infradead.org>2006-09-28 18:19:09 -0300
committerMauro Carvalho Chehab <mchehab@infradead.org>2006-09-28 18:19:09 -0300
commit80f09f603d2001e9a765d66aa5fa5cf5f9f8ed44 (patch)
tree47ab08df25ce956b894779491385b3962b01fc77 /linux/drivers/media/dvb/dvb-usb
parenteb7519ddf0079fb5e8a48fe4ec4091ded9de495a (diff)
parent5a8d592ca3b750889157d08b2e349e036a678663 (diff)
downloadmediapointer-dvb-s2-80f09f603d2001e9a765d66aa5fa5cf5f9f8ed44.tar.gz
mediapointer-dvb-s2-80f09f603d2001e9a765d66aa5fa5cf5f9f8ed44.tar.bz2
merge: http://www.linuxtv.org/hg/~stoth/hvr1300-final
From: Mauro Carvalho Chehab <mchehab@infradead.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'linux/drivers/media/dvb/dvb-usb')
-rw-r--r--linux/drivers/media/dvb/dvb-usb/gp8psk.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/linux/drivers/media/dvb/dvb-usb/gp8psk.c b/linux/drivers/media/dvb/dvb-usb/gp8psk.c
index 2685a5ab4..e2d906985 100644
--- a/linux/drivers/media/dvb/dvb-usb/gp8psk.c
+++ b/linux/drivers/media/dvb/dvb-usb/gp8psk.c
@@ -219,7 +219,7 @@ static struct dvb_usb_device_properties gp8psk_properties = {
.cold_ids = { &gp8psk_usb_table[0], NULL },
.warm_ids = { &gp8psk_usb_table[1], NULL },
},
- { 0 },
+ { NULL },
}
};