diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2015-04-14 17:51:33 +0200 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2015-04-14 17:51:33 +0200 |
| commit | 85a3685852d9ac7d92be9d824533c915a4597fa4 (patch) | |
| tree | b7c542e2061cf96c9f7ad500fa12567f9ff0b39f /drivers/input/serio/gscps2.c | |
| parent | Input: alps - non interleaved V2 dualpoint has separate stick button bits (diff) | |
| parent | Input: atkbd - document "no new force-release quirks" policy (diff) | |
| download | linux-85a3685852d9ac7d92be9d824533c915a4597fa4.tar.xz linux-85a3685852d9ac7d92be9d824533c915a4597fa4.zip | |
Merge branch 'next' into for-linus
Prepare first round of input updates for 4.1 merge window.
Diffstat (limited to 'drivers/input/serio/gscps2.c')
| -rw-r--r-- | drivers/input/serio/gscps2.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/input/serio/gscps2.c b/drivers/input/serio/gscps2.c index 94ab494a6ade..ecba666afadb 100644 --- a/drivers/input/serio/gscps2.c +++ b/drivers/input/serio/gscps2.c @@ -31,7 +31,6 @@ #include <linux/spinlock.h> #include <linux/delay.h> #include <linux/ioport.h> -#include <linux/pci_ids.h> #include <asm/irq.h> #include <asm/io.h> |