git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'topic/hda' into for-linus
[pandora-kernel.git]
/
drivers
/
input
/
serio
/
ambakmi.c
diff --git
a/drivers/input/serio/ambakmi.c
b/drivers/input/serio/ambakmi.c
index
e29cdc1
..
a28c06d
100644
(file)
--- a/
drivers/input/serio/ambakmi.c
+++ b/
drivers/input/serio/ambakmi.c
@@
-107,7
+107,7
@@
static void amba_kmi_close(struct serio *io)
clk_disable(kmi->clk);
}
-static int amba_kmi_probe(struct amba_device *dev,
vo
id *id)
+static int amba_kmi_probe(struct amba_device *dev,
struct amba_
id *id)
{
struct amba_kmi_port *kmi;
struct serio *io;