diff options
Diffstat (limited to 'drivers/macintosh')
-rw-r--r-- | drivers/macintosh/mac_hid.c | 17 |
1 files changed, 6 insertions, 11 deletions
diff --git a/drivers/macintosh/mac_hid.c b/drivers/macintosh/mac_hid.c index cc9f27514aef..7b4ef5bb556b 100644 --- a/drivers/macintosh/mac_hid.c +++ b/drivers/macintosh/mac_hid.c | |||
@@ -27,54 +27,49 @@ static int mouse_last_keycode; | |||
27 | /* file(s) in /proc/sys/dev/mac_hid */ | 27 | /* file(s) in /proc/sys/dev/mac_hid */ |
28 | static ctl_table mac_hid_files[] = { | 28 | static ctl_table mac_hid_files[] = { |
29 | { | 29 | { |
30 | .ctl_name = DEV_MAC_HID_MOUSE_BUTTON_EMULATION, | ||
31 | .procname = "mouse_button_emulation", | 30 | .procname = "mouse_button_emulation", |
32 | .data = &mouse_emulate_buttons, | 31 | .data = &mouse_emulate_buttons, |
33 | .maxlen = sizeof(int), | 32 | .maxlen = sizeof(int), |
34 | .mode = 0644, | 33 | .mode = 0644, |
35 | .proc_handler = &proc_dointvec, | 34 | .proc_handler = proc_dointvec, |
36 | }, | 35 | }, |
37 | { | 36 | { |
38 | .ctl_name = DEV_MAC_HID_MOUSE_BUTTON2_KEYCODE, | ||
39 | .procname = "mouse_button2_keycode", | 37 | .procname = "mouse_button2_keycode", |
40 | .data = &mouse_button2_keycode, | 38 | .data = &mouse_button2_keycode, |
41 | .maxlen = sizeof(int), | 39 | .maxlen = sizeof(int), |
42 | .mode = 0644, | 40 | .mode = 0644, |
43 | .proc_handler = &proc_dointvec, | 41 | .proc_handler = proc_dointvec, |
44 | }, | 42 | }, |
45 | { | 43 | { |
46 | .ctl_name = DEV_MAC_HID_MOUSE_BUTTON3_KEYCODE, | ||
47 | .procname = "mouse_button3_keycode", | 44 | .procname = "mouse_button3_keycode", |
48 | .data = &mouse_button3_keycode, | 45 | .data = &mouse_button3_keycode, |
49 | .maxlen = sizeof(int), | 46 | .maxlen = sizeof(int), |
50 | .mode = 0644, | 47 | .mode = 0644, |
51 | .proc_handler = &proc_dointvec, | 48 | .proc_handler = proc_dointvec, |
52 | }, | 49 | }, |
53 | { .ctl_name = 0 } | 50 | { } |
54 | }; | 51 | }; |
55 | 52 | ||
56 | /* dir in /proc/sys/dev */ | 53 | /* dir in /proc/sys/dev */ |
57 | static ctl_table mac_hid_dir[] = { | 54 | static ctl_table mac_hid_dir[] = { |
58 | { | 55 | { |
59 | .ctl_name = DEV_MAC_HID, | ||
60 | .procname = "mac_hid", | 56 | .procname = "mac_hid", |
61 | .maxlen = 0, | 57 | .maxlen = 0, |
62 | .mode = 0555, | 58 | .mode = 0555, |
63 | .child = mac_hid_files, | 59 | .child = mac_hid_files, |
64 | }, | 60 | }, |
65 | { .ctl_name = 0 } | 61 | { } |
66 | }; | 62 | }; |
67 | 63 | ||
68 | /* /proc/sys/dev itself, in case that is not there yet */ | 64 | /* /proc/sys/dev itself, in case that is not there yet */ |
69 | static ctl_table mac_hid_root_dir[] = { | 65 | static ctl_table mac_hid_root_dir[] = { |
70 | { | 66 | { |
71 | .ctl_name = CTL_DEV, | ||
72 | .procname = "dev", | 67 | .procname = "dev", |
73 | .maxlen = 0, | 68 | .maxlen = 0, |
74 | .mode = 0555, | 69 | .mode = 0555, |
75 | .child = mac_hid_dir, | 70 | .child = mac_hid_dir, |
76 | }, | 71 | }, |
77 | { .ctl_name = 0 } | 72 | { } |
78 | }; | 73 | }; |
79 | 74 | ||
80 | static struct ctl_table_header *mac_hid_sysctl_header; | 75 | static struct ctl_table_header *mac_hid_sysctl_header; |