summaryrefslogtreecommitdiff
path: root/linux/drivers/media/dvb/dvb-usb/dvb-usb.h
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@redhat.com>2009-04-23 09:45:13 -0300
committerMauro Carvalho Chehab <mchehab@redhat.com>2009-04-23 09:45:13 -0300
commitafbe8098d1f0cf8f7e66a817c530318c67e155ee (patch)
tree6d9fbb7a8dbba9325f2bb77ddfd27ea5a2d5752c /linux/drivers/media/dvb/dvb-usb/dvb-usb.h
parent990ddd211286de0b58e67483c758ce029715c97e (diff)
parent35fd9350715393e0694b0bdf01394eae7e590e43 (diff)
downloadmediapointer-dvb-s2-afbe8098d1f0cf8f7e66a817c530318c67e155ee.tar.gz
mediapointer-dvb-s2-afbe8098d1f0cf8f7e66a817c530318c67e155ee.tar.bz2
merge: http://linuxtv.org/hg/~pinchartl/uvcvideo/
From: Mauro Carvalho Chehab <mchehab@redhat.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'linux/drivers/media/dvb/dvb-usb/dvb-usb.h')
-rw-r--r--linux/drivers/media/dvb/dvb-usb/dvb-usb.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/linux/drivers/media/dvb/dvb-usb/dvb-usb.h b/linux/drivers/media/dvb/dvb-usb/dvb-usb.h
index fd64daa06..8874221c1 100644
--- a/linux/drivers/media/dvb/dvb-usb/dvb-usb.h
+++ b/linux/drivers/media/dvb/dvb-usb/dvb-usb.h
@@ -224,7 +224,7 @@ struct dvb_usb_device_properties {
int generic_bulk_ctrl_endpoint;
int num_device_descs;
- struct dvb_usb_device_description devices[11];
+ struct dvb_usb_device_description devices[12];
};
/**