summaryrefslogtreecommitdiffstats
path: root/drivers/usb/input
diff options
context:
space:
mode:
authorJiri Kosina <jkosina@suse.cz>2007-01-29 12:44:41 +0100
committerJiri Kosina <jkosina@suse.cz>2007-01-30 15:05:27 +0100
commit76398f9667e8369023ed5f4847fb59e9da8b6968 (patch)
treebcb37fe18e6b1ec3b9b79c4ac9eb015b199d0c15 /drivers/usb/input
parent8eda232e226b97c8f2fcbc5f672135247c1ee348 (diff)
downloadop-kernel-dev-76398f9667e8369023ed5f4847fb59e9da8b6968.zip
op-kernel-dev-76398f9667e8369023ed5f4847fb59e9da8b6968.tar.gz
HID: fix pb_fnmode and move it to generic HID
The apple powerbook people are used to switch the pb_fnmode setting at runtime through writing to sysfs, altering the module parameter value. This was broken for them in 2.6.20-rc1 when generic HID layer was introduced, as the pb_fnmode flag was made per-hiddevice, instead of global variable. This patch moves the pb_fnmode module parameter from usbhid module to hid module, but apart from that retains backward compatibility with respect to changing the mode through sysfs. Signed-off-by: Jiri Kosina <jkosina@suse.cz>
Diffstat (limited to 'drivers/usb/input')
-rw-r--r--drivers/usb/input/hid-core.c9
1 files changed, 0 insertions, 9 deletions
diff --git a/drivers/usb/input/hid-core.c b/drivers/usb/input/hid-core.c
index b864804..c6c9e72 100644
--- a/drivers/usb/input/hid-core.c
+++ b/drivers/usb/input/hid-core.c
@@ -56,11 +56,6 @@ static unsigned int hid_mousepoll_interval;
module_param_named(mousepoll, hid_mousepoll_interval, uint, 0644);
MODULE_PARM_DESC(mousepoll, "Polling interval of mice");
-static int usbhid_pb_fnmode = 1;
-module_param_named(pb_fnmode, usbhid_pb_fnmode, int, 0644);
-MODULE_PARM_DESC(pb_fnmode,
- "Mode of fn key on PowerBooks (0 = disabled, 1 = fkeyslast, 2 = fkeysfirst)");
-
/*
* Input submission and I/O error handler.
*/
@@ -1246,10 +1241,6 @@ static struct hid_device *usb_hid_configure(struct usb_interface *intf)
hid->hiddev_hid_event = hiddev_hid_event;
hid->hiddev_report_event = hiddev_report_event;
#endif
-#ifdef CONFIG_USB_HIDINPUT_POWERBOOK
- hid->pb_fnmode = usbhid_pb_fnmode;
-#endif
-
return hid;
fail:
OpenPOWER on IntegriCloud