diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2010-02-02 17:10:39 -0500 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2010-02-02 17:10:39 -0500 |
| commit | e1a0bdd8022317e98650e70850de73eccfcde5ad (patch) | |
| tree | 462f63307118b95c8cbacee6954e4d09ee85b8d1 /drivers/hid/hid-lg.h | |
| parent | 8127f4e883666c9960cfa89cffd36313748f8bab (diff) | |
| parent | 1a45dcfe2525e9432cb4aba461d4994fc2befe42 (diff) | |
Merge branch 'master' into upstream
Conflicts:
drivers/hid/hid-ids.h
Diffstat (limited to 'drivers/hid/hid-lg.h')
| -rw-r--r-- | drivers/hid/hid-lg.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/hid/hid-lg.h b/drivers/hid/hid-lg.h index 8069c3e8b64a..ce2ac8672624 100644 --- a/drivers/hid/hid-lg.h +++ b/drivers/hid/hid-lg.h | |||
| @@ -1,8 +1,6 @@ | |||
| 1 | #ifndef __HID_LG_H | 1 | #ifndef __HID_LG_H |
| 2 | #define __HID_LG_H | 2 | #define __HID_LG_H |
| 3 | 3 | ||
| 4 | #include <linux/autoconf.h> | ||
| 5 | |||
| 6 | #ifdef CONFIG_LOGITECH_FF | 4 | #ifdef CONFIG_LOGITECH_FF |
| 7 | int lgff_init(struct hid_device *hdev); | 5 | int lgff_init(struct hid_device *hdev); |
| 8 | #else | 6 | #else |