git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
[sfrench/cifs-2.6.git]
/
drivers
/
input
/
rmi4
/
rmi_driver.c
diff --git
a/drivers/input/rmi4/rmi_driver.c
b/drivers/input/rmi4/rmi_driver.c
index cb6efe6933022f1fa3141f4cb6bce366e1141617..11447ab1055cd4beadf7eca752bdf9494d76cef1 100644
(file)
--- a/
drivers/input/rmi4/rmi_driver.c
+++ b/
drivers/input/rmi4/rmi_driver.c
@@
-18,7
+18,6
@@
#include <linux/delay.h>
#include <linux/fs.h>
#include <linux/irq.h>
-#include <linux/kconfig.h>
#include <linux/pm.h>
#include <linux/slab.h>
#include <linux/of.h>