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 tag 'v3.13-rc4' into next
[sfrench/cifs-2.6.git]
/
arch
/
sh
/
boards
/
mach-ecovec24
/
setup.c
diff --git
a/arch/sh/boards/mach-ecovec24/setup.c
b/arch/sh/boards/mach-ecovec24/setup.c
index 122f737a901fbad4e22de06652e6eb9b04abdfc8..5bc3a15465c71a53906ed0f99a848298c30b2831 100644
(file)
--- a/
arch/sh/boards/mach-ecovec24/setup.c
+++ b/
arch/sh/boards/mach-ecovec24/setup.c
@@
-502,7
+502,7
@@
static struct platform_device keysc_device = {
/* TouchScreen */
#define IRQ0 evt2irq(0x600)
-static int ts_get_pendown_state(
void
)
+static int ts_get_pendown_state(
struct device *dev
)
{
int val = 0;
gpio_free(GPIO_FN_INTC_IRQ0);