---

yaml --- r: 330654 b: refs/heads/master c: edc7d44 h: refs/heads/master v: v3
git-mirror · Aug 4, 2012 · 4127c0e · 4127c0e
1 parent 3817e3d
commit 4127c0e
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 5 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f93c80288730427c461d6db573411ca50683bd44
+refs/heads/master: edc7d4483473d71833fd4851ca0dbf8680b43ae1
diff --git a/trunk/drivers/media/dvb/dvb-usb/dvb_usb.h b/trunk/drivers/media/dvb/dvb-usb/dvb_usb.h
@@ -331,9 +331,7 @@ struct dvb_usb_adapter {
  * @usb_mutex: mutex for usb control messages
  * @i2c_mutex: mutex for i2c-transfers
  * @i2c_adap: device's i2c-adapter
- *
  * @rc_dev: rc device for the remote control
- * @input_dev: input device for the remote control (legacy mode)
  * @rc_query_work: work for polling remote
  * @priv: private data of the actual driver (allocate by dvb usb, size defined
  *  in size_of_priv of dvb_usb_properties).
@@ -361,7 +359,6 @@ struct dvb_usb_device {
 
 	/* remote control */
 	struct rc_dev *rc_dev;
-	struct input_dev *input_dev;
 	char rc_phys[64];
 	struct delayed_work rc_query_work;
 

diff --git a/trunk/drivers/media/dvb/dvb-usb/dvb_usb_core.c b/trunk/drivers/media/dvb/dvb-usb/dvb_usb_core.c
@@ -159,7 +159,6 @@ static int dvb_usbv2_remote_init(struct dvb_usb_device *d)
 		goto err;
 	}
 
-	d->input_dev = NULL;
 	d->rc_dev = dev;
 
 	/* start polling if needed */