aboutsummaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/mach-imx/mach-cpuimx35.c2
-rw-r--r--arch/arm/mach-imx/mach-cpuimx51sd.c2
-rw-r--r--arch/sh/boards/mach-ecovec24/setup.c2
3 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/mach-imx/mach-cpuimx35.c b/arch/arm/mach-imx/mach-cpuimx35.c
index 771362d1fbee..65e4c53e1554 100644
--- a/arch/arm/mach-imx/mach-cpuimx35.c
+++ b/arch/arm/mach-imx/mach-cpuimx35.c
@@ -53,7 +53,7 @@ static const struct imxi2c_platform_data
53}; 53};
54 54
55#define TSC2007_IRQGPIO IMX_GPIO_NR(3, 2) 55#define TSC2007_IRQGPIO IMX_GPIO_NR(3, 2)
56static int tsc2007_get_pendown_state(void) 56static int tsc2007_get_pendown_state(struct device *dev)
57{ 57{
58 return !gpio_get_value(TSC2007_IRQGPIO); 58 return !gpio_get_value(TSC2007_IRQGPIO);
59} 59}
diff --git a/arch/arm/mach-imx/mach-cpuimx51sd.c b/arch/arm/mach-imx/mach-cpuimx51sd.c
index 9b5ddf5bbd33..1fba2b8e983f 100644
--- a/arch/arm/mach-imx/mach-cpuimx51sd.c
+++ b/arch/arm/mach-imx/mach-cpuimx51sd.c
@@ -121,7 +121,7 @@ static const struct imxuart_platform_data uart_pdata __initconst = {
121 .flags = IMXUART_HAVE_RTSCTS, 121 .flags = IMXUART_HAVE_RTSCTS,
122}; 122};
123 123
124static int tsc2007_get_pendown_state(void) 124static int tsc2007_get_pendown_state(struct device *dev)
125{ 125{
126 if (mx51_revision() < IMX_CHIP_REVISION_3_0) 126 if (mx51_revision() < IMX_CHIP_REVISION_3_0)
127 return !gpio_get_value(TSC2007_IRQGPIO_REV2); 127 return !gpio_get_value(TSC2007_IRQGPIO_REV2);
diff --git a/arch/sh/boards/mach-ecovec24/setup.c b/arch/sh/boards/mach-ecovec24/setup.c
index 1fa8be409771..23d7e45f9d14 100644
--- a/arch/sh/boards/mach-ecovec24/setup.c
+++ b/arch/sh/boards/mach-ecovec24/setup.c
@@ -501,7 +501,7 @@ static struct platform_device keysc_device = {
501/* TouchScreen */ 501/* TouchScreen */
502#define IRQ0 evt2irq(0x600) 502#define IRQ0 evt2irq(0x600)
503 503
504static int ts_get_pendown_state(void) 504static int ts_get_pendown_state(struct device *dev)
505{ 505{
506 int val = 0; 506 int val = 0;
507 gpio_free(GPIO_FN_INTC_IRQ0); 507 gpio_free(GPIO_FN_INTC_IRQ0);