diff options
| -rw-r--r-- | linux/drivers/media/dvb/dvb-usb/cxusb.c | 6 | ||||
| -rw-r--r-- | v4l/ChangeLog | 8 |
2 files changed, 11 insertions, 3 deletions
diff --git a/linux/drivers/media/dvb/dvb-usb/cxusb.c b/linux/drivers/media/dvb/dvb-usb/cxusb.c index 1621f73c0..9ba8406db 100644 --- a/linux/drivers/media/dvb/dvb-usb/cxusb.c +++ b/linux/drivers/media/dvb/dvb-usb/cxusb.c @@ -222,13 +222,13 @@ static int cxusb_lgdt330x_frontend_attach(struct dvb_usb_device *d) /* DVB USB Driver stuff */ static struct dvb_usb_properties cxusb_medion_properties; -static struct dvb_usb_properties cxusb_bluebird_atsc_properties; +static struct dvb_usb_properties cxusb_bluebird_lgh064f_properties; static int cxusb_probe(struct usb_interface *intf, const struct usb_device_id *id) { if (dvb_usb_device_init(intf,&cxusb_medion_properties,THIS_MODULE,NULL) == 0 || - dvb_usb_device_init(intf,&cxusb_bluebird_atsc_properties,THIS_MODULE,NULL) == 0) { + dvb_usb_device_init(intf,&cxusb_bluebird_lgh064f_properties,THIS_MODULE,NULL) == 0) { return 0; } @@ -279,7 +279,7 @@ static struct dvb_usb_properties cxusb_medion_properties = { } }; -static struct dvb_usb_properties cxusb_bluebird_atsc_properties = { +static struct dvb_usb_properties cxusb_bluebird_lgh064f_properties = { .caps = DVB_USB_IS_AN_I2C_ADAPTER, .usb_ctrl = CYPRESS_FX2, diff --git a/v4l/ChangeLog b/v4l/ChangeLog index db023e8ae..c5c8d8406 100644 --- a/v4l/ChangeLog +++ b/v4l/ChangeLog @@ -1,3 +1,11 @@ +2006-01-03 04:01 mkrufky + + * linux/drivers/media/dvb/dvb-usb/cxusb.c: (cxusb_probe): + - renamed struct dvb_usb_properties from + cxusb_bluebird_atsc_properties to cxusb_bluebird_lgh064f_properties + + Signed-off-by: Michael Krufky <mkrufky@m1k.net> + 2006-01-03 03:08 endriss * linux/drivers/media/dvb/ttpci/av7110.c: (gpioirq) |