Merge branch 'for-next' of git://git.samba.org/sfrench/cifs-2.6

[~andy/linux] / drivers / input / keyboard / adp5588-keys.c

diff --git a/drivers/input/keyboard/adp5588-keys.c b/drivers/input/keyboard/adp5588-keys.c
index 39ebffac207edc419dcc381aff9aae3791a6e53d..b083bf10f13941020215421b52c485e8fb99d22b 100644 (file)
--- a/drivers/input/keyboard/adp5588-keys.c
+++ b/drivers/input/keyboard/adp5588-keys.c
@@ -197,6 +197,7 @@ static int __devinit adp5588_gpio_add(struct adp5588_kpad *kpad)
        kpad->gc.base = gpio_data->gpio_start;
        kpad->gc.label = kpad->client->name;
        kpad->gc.owner = THIS_MODULE;
+       kpad->gc.names = gpio_data->names;
 
        mutex_init(&kpad->gpio_lock);