Merge branch 'master' of git://blackhole.kfki.hu/nf

[linux.git] / drivers / input / keyboard / gpio_keys.c

diff --git a/drivers/input/keyboard/gpio_keys.c b/drivers/input/keyboard/gpio_keys.c
index 1f56d53454b22c0a6590b28cb89d47ab48d38a60..53c9ff338dea405076283bc6238109a76c0e618e 100644 (file)
--- a/drivers/input/keyboard/gpio_keys.c
+++ b/drivers/input/keyboard/gpio_keys.c
@@ -55,7 +55,7 @@ struct gpio_keys_drvdata {
        struct input_dev *input;
        struct mutex disable_lock;
        unsigned short *keymap;
-       struct gpio_button_data data[0];
+       struct gpio_button_data data[];
 };
 
 /*