aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJarod Wilson <jarod@redhat.com>2011-05-25 21:56:32 (GMT)
committerJarod Wilson <jarod@redhat.com>2011-05-25 21:59:40 (GMT)
commitda40edf48c4afcd57ca7105b3313ffb2ea55a600 (patch)
tree806c1c2b5317a9ed842d10a978ce17cc920a556a
parent5a1a8aa19082209a9e56b5165b8e68675682c6c9 (diff)
Use {g,s}etkeycode_new on 2.6.38
There was a temporary {g,s}etkeycode_new in the input layer in 2.6.38 as we moved from an older definition to a new one. This partially reverts upstream commit aebd636bd60e2dda0ebc907dd5f7f4a45174411c so that we use the _new variant when building atop 2.6.38. Signed-off-by: Jarod Wilson <jarod@redhat.com>
-rw-r--r--backports/v2.6.38_series1
-rw-r--r--backports/v2.6.38_use_getkeycode_new_setkeycode_new.patch34
2 files changed, 35 insertions, 0 deletions
diff --git a/backports/v2.6.38_series b/backports/v2.6.38_series
new file mode 100644
index 0000000..abe9518
--- /dev/null
+++ b/backports/v2.6.38_series
@@ -0,0 +1 @@
+v2.6.38_use_getkeycode_new_setkeycode_new.patch
diff --git a/backports/v2.6.38_use_getkeycode_new_setkeycode_new.patch b/backports/v2.6.38_use_getkeycode_new_setkeycode_new.patch
new file mode 100644
index 0000000..d5eb8b3
--- /dev/null
+++ b/backports/v2.6.38_use_getkeycode_new_setkeycode_new.patch
@@ -0,0 +1,34 @@
+ drivers/media/dvb/dvb-usb/dvb-usb-remote.c | 4 ++--
+ drivers/media/rc/rc-main.c | 4 ++--
+ 2 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/drivers/media/dvb/dvb-usb/dvb-usb-remote.c b/drivers/media/dvb/dvb-usb/dvb-usb-remote.c
+index 41bacff..a031975 100644
+--- a/drivers/media/dvb/dvb-usb/dvb-usb-remote.c
++++ b/drivers/media/dvb/dvb-usb/dvb-usb-remote.c
+@@ -198,8 +198,8 @@ static int legacy_dvb_usb_remote_init(struct dvb_usb_device *d)
+ d->input_dev = input_dev;
+ d->rc_dev = NULL;
+
+- input_dev->getkeycode = legacy_dvb_usb_getkeycode;
+- input_dev->setkeycode = legacy_dvb_usb_setkeycode;
++ input_dev->getkeycode_new = legacy_dvb_usb_getkeycode;
++ input_dev->setkeycode_new = legacy_dvb_usb_setkeycode;
+
+ /* set the bits for the keys */
+ deb_rc("key map size: %d\n", d->props.rc.legacy.rc_map_size);
+diff --git a/drivers/media/rc/rc-main.c b/drivers/media/rc/rc-main.c
+index 0497e06..1202f0d 100644
+--- a/drivers/media/rc/rc-main.c
++++ b/drivers/media/rc/rc-main.c
+@@ -989,8 +989,8 @@ struct rc_dev *rc_allocate_device(void)
+ return NULL;
+ }
+
+- dev->input_dev->getkeycode = ir_getkeycode;
+- dev->input_dev->setkeycode = ir_setkeycode;
++ dev->input_dev->getkeycode_new = ir_getkeycode;
++ dev->input_dev->setkeycode_new = ir_setkeycode;
+ input_set_drvdata(dev->input_dev, dev);
+
+ spin_lock_init(&dev->rc_map.lock);

Privacy Policy