diff options
author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2012-04-21 23:28:35 -0700 |
---|---|---|
committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2012-04-21 23:28:35 -0700 |
commit | 57b8628bb0ac4e47c806e45c5bbd89282e93869b (patch) | |
tree | ee9289f0898054474b7e5054abdb3ffb78666436 /drivers/input/serio/maceps2.c | |
parent | 486c8aba39e5f194519cd5c0e85e5d1de8b74b03 (diff) | |
parent | 66f75a5d028beaf67c931435fdc3e7823125730c (diff) | |
download | op-kernel-dev-57b8628bb0ac4e47c806e45c5bbd89282e93869b.zip op-kernel-dev-57b8628bb0ac4e47c806e45c5bbd89282e93869b.tar.gz |
Merge commit 'v3.4-rc4' into next
Diffstat (limited to 'drivers/input/serio/maceps2.c')
-rw-r--r-- | drivers/input/serio/maceps2.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/input/serio/maceps2.c b/drivers/input/serio/maceps2.c index 558200e..61da763 100644 --- a/drivers/input/serio/maceps2.c +++ b/drivers/input/serio/maceps2.c @@ -21,7 +21,6 @@ #include <asm/io.h> #include <asm/irq.h> -#include <asm/system.h> #include <asm/ip32/mace.h> #include <asm/ip32/ip32_ints.h> |