Merge tag 'gpio-for-linus' of git://git.secretlab.ca/git/linux-2.6

[linux-beck.git] / arch / arm / mach-imx / mach-mx35_3ds.c

diff --git a/arch/arm/mach-imx/mach-mx35_3ds.c b/arch/arm/mach-imx/mach-mx35_3ds.c
index e99b016bbbb6724197a0831927fbe85e24a6f8a9..28aa19476de73dc47ea40eaec323e71e1623b7e7 100644 (file)
--- a/arch/arm/mach-imx/mach-mx35_3ds.c
+++ b/arch/arm/mach-imx/mach-mx35_3ds.c
@@ -98,8 +98,7 @@ static struct i2c_board_info __initdata i2c_devices_3ds[] = {
 
 static int lcd_power_gpio = -ENXIO;
 
-static int mc9s08dz60_gpiochip_match(struct gpio_chip *chip,
-                                                    const void *data)
+static int mc9s08dz60_gpiochip_match(struct gpio_chip *chip, void *data)
 {
        return !strcmp(chip->label, data);
 }
@@ -612,7 +611,7 @@ static void __init mx35pdk_timer_init(void)
        mx35_clocks_init();
 }
 
-struct sys_timer mx35pdk_timer = {
+static struct sys_timer mx35pdk_timer = {
        .init   = mx35pdk_timer_init,
 };