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-next' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-2.6
[sfrench/cifs-2.6.git]
/
drivers
/
input
/
misc
/
ab8500-ponkey.c
diff --git
a/drivers/input/misc/ab8500-ponkey.c
b/drivers/input/misc/ab8500-ponkey.c
index 79d9016336355a4885681ca68a2a0249b3b5894e..350fd0c385d2449115ea332fdf8f27601c46485c 100644
(file)
--- a/
drivers/input/misc/ab8500-ponkey.c
+++ b/
drivers/input/misc/ab8500-ponkey.c
@@
-12,7
+12,7
@@
#include <linux/platform_device.h>
#include <linux/input.h>
#include <linux/interrupt.h>
-#include <linux/mfd/ab8500.h>
+#include <linux/mfd/ab
x500/ab
8500.h>
#include <linux/slab.h>
/**