diff options
| author | Michel Daenzer <michel@tungstengraphics.com> | 2007-10-24 16:30:34 +0200 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2008-01-28 14:51:19 +0100 |
| commit | 81e1a875505f2963f4d22f7e7ade39d764755f9b (patch) | |
| tree | faa6f32b4b4bcc1d47cb61c67bb0ae5932bb14cf /include | |
| parent | 3c684c8cd4d1a81004daa21f7ad3dad5119916e3 (diff) | |
| download | linux-3.10-81e1a875505f2963f4d22f7e7ade39d764755f9b.tar.gz linux-3.10-81e1a875505f2963f4d22f7e7ade39d764755f9b.tar.bz2 linux-3.10-81e1a875505f2963f4d22f7e7ade39d764755f9b.zip | |
HID: Rename some code identifiers from PowerBook specific to Apple generic
Preserve identifiers exposed in build and run time configuration though in
order not to break existing configurations.
This is in preparation for adding support for Apple aluminum USB keyboards.
Signed-off-by: Michel Daenzer <michel@tungstengraphics.com>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/hid.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/include/linux/hid.h b/include/linux/hid.h index 6e35b92b1d2..833f2af8aab 100644 --- a/include/linux/hid.h +++ b/include/linux/hid.h @@ -267,10 +267,10 @@ struct hid_item { #define HID_QUIRK_2WHEEL_MOUSE_HACK_5 0x00000100 #define HID_QUIRK_2WHEEL_MOUSE_HACK_ON 0x00000200 #define HID_QUIRK_MIGHTYMOUSE 0x00000400 -#define HID_QUIRK_POWERBOOK_HAS_FN 0x00000800 -#define HID_QUIRK_POWERBOOK_FN_ON 0x00001000 +#define HID_QUIRK_APPLE_HAS_FN 0x00000800 +#define HID_QUIRK_APPLE_FN_ON 0x00001000 #define HID_QUIRK_INVERT_HWHEEL 0x00002000 -#define HID_QUIRK_POWERBOOK_ISO_KEYBOARD 0x00004000 +#define HID_QUIRK_APPLE_ISO_KEYBOARD 0x00004000 #define HID_QUIRK_BAD_RELATIVE_KEYS 0x00008000 #define HID_QUIRK_SKIP_OUTPUT_REPORTS 0x00010000 #define HID_QUIRK_IGNORE_MOUSE 0x00020000 @@ -469,7 +469,7 @@ struct hid_device { /* device report descriptor */ /* handler for raw output data, used by hidraw */ int (*hid_output_raw_report) (struct hid_device *, __u8 *, size_t); #ifdef CONFIG_USB_HIDINPUT_POWERBOOK - unsigned long pb_pressed_fn[BITS_TO_LONGS(KEY_CNT)]; + unsigned long apple_pressed_fn[BITS_TO_LONGS(KEY_CNT)]; unsigned long pb_pressed_numlock[BITS_TO_LONGS(KEY_CNT)]; #endif }; |