diff options
| author | Michael Krufky <mkrufky@linuxtv.org> | 2006-10-03 15:46:33 -0400 |
|---|---|---|
| committer | Michael Krufky <mkrufky@linuxtv.org> | 2006-10-03 15:46:33 -0400 |
| commit | 39f8c8cf4eedd31a816f6cc20e8f3f4f13199758 (patch) | |
| tree | 2e72643ee03dd7840d9f71ddcd27642443817429 | |
| parent | 1dbb128dceee78e8bcaada93e52d992c104737d0 (diff) | |
| download | mediapointer-dvb-s2-39f8c8cf4eedd31a816f6cc20e8f3f4f13199758.tar.gz mediapointer-dvb-s2-39f8c8cf4eedd31a816f6cc20e8f3f4f13199758.tar.bz2 | |
m920x: fix build in hg tree / other trivial fixes
From: Michael Krufky <mkrufky@linuxtv.org>
- removed extra newline
- removed NULL entry
- fixed versions.txt
Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
| -rw-r--r-- | linux/drivers/media/dvb/dvb-usb/m920x.c | 2 | ||||
| -rw-r--r-- | v4l/versions.txt | 2 |
2 files changed, 1 insertions, 3 deletions
diff --git a/linux/drivers/media/dvb/dvb-usb/m920x.c b/linux/drivers/media/dvb/dvb-usb/m920x.c index c10944a4f..e44b52414 100644 --- a/linux/drivers/media/dvb/dvb-usb/m920x.c +++ b/linux/drivers/media/dvb/dvb-usb/m920x.c @@ -138,7 +138,6 @@ static int m9206_rc_query(struct dvb_usb_device *d, u32 *event, int *state) } /* I2C */ - static int m9206_i2c_xfer(struct i2c_adapter *adap, struct i2c_msg msg[], int num) { struct dvb_usb_device *d = i2c_get_adapdata(adap); @@ -471,7 +470,6 @@ static struct dvb_usb_device_properties megasky_properties = { { &m920x_table[0], NULL }, { NULL }, }, - { NULL }, } }; diff --git a/v4l/versions.txt b/v4l/versions.txt index 2d7ad4ee4..85bc48eef 100644 --- a/v4l/versions.txt +++ b/v4l/versions.txt @@ -111,7 +111,7 @@ DVB_USB_DIBUSB_MB_FAULTY DVB_USB_DIBUSB_MC DVB_USB_UMT_010 DVB_USB_CXUSB -DVB_USB_MEGASKY +DVB_USB_M920X DVB_USB_DIGITV DVB_USB_VP7045 DVB_USB_VP702X |