summaryrefslogtreecommitdiffstats
path: root/drivers/hid/hid-lg.h
diff options
context:
space:
mode:
authorJiri Kosina <jkosina@suse.cz>2010-02-02 23:10:39 +0100
committerJiri Kosina <jkosina@suse.cz>2010-02-02 23:10:39 +0100
commite1a0bdd8022317e98650e70850de73eccfcde5ad (patch)
tree462f63307118b95c8cbacee6954e4d09ee85b8d1 /drivers/hid/hid-lg.h
parent8127f4e883666c9960cfa89cffd36313748f8bab (diff)
parent1a45dcfe2525e9432cb4aba461d4994fc2befe42 (diff)
downloadlinux-e1a0bdd8022317e98650e70850de73eccfcde5ad.tar.bz2
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.h2
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 @@
#ifndef __HID_LG_H
#define __HID_LG_H
-#include <linux/autoconf.h>
-
#ifdef CONFIG_LOGITECH_FF
int lgff_init(struct hid_device *hdev);
#else