diff options
-rw-r--r-- | drivers/input/keyboard/adp5588-keys.c | 1 | ||||
-rw-r--r-- | include/linux/i2c/adp5588.h | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/drivers/input/keyboard/adp5588-keys.c b/drivers/input/keyboard/adp5588-keys.c index 39ebffac207e..b083bf10f139 100644 --- 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) | |||
197 | kpad->gc.base = gpio_data->gpio_start; | 197 | kpad->gc.base = gpio_data->gpio_start; |
198 | kpad->gc.label = kpad->client->name; | 198 | kpad->gc.label = kpad->client->name; |
199 | kpad->gc.owner = THIS_MODULE; | 199 | kpad->gc.owner = THIS_MODULE; |
200 | kpad->gc.names = gpio_data->names; | ||
200 | 201 | ||
201 | mutex_init(&kpad->gpio_lock); | 202 | mutex_init(&kpad->gpio_lock); |
202 | 203 | ||
diff --git a/include/linux/i2c/adp5588.h b/include/linux/i2c/adp5588.h index cec17cf6cac2..d8341cb47b60 100644 --- a/include/linux/i2c/adp5588.h +++ b/include/linux/i2c/adp5588.h | |||
@@ -157,6 +157,7 @@ struct i2c_client; /* forward declaration */ | |||
157 | 157 | ||
158 | struct adp5588_gpio_platform_data { | 158 | struct adp5588_gpio_platform_data { |
159 | int gpio_start; /* GPIO Chip base # */ | 159 | int gpio_start; /* GPIO Chip base # */ |
160 | const char *const *names; | ||
160 | unsigned irq_base; /* interrupt base # */ | 161 | unsigned irq_base; /* interrupt base # */ |
161 | unsigned pullup_dis_mask; /* Pull-Up Disable Mask */ | 162 | unsigned pullup_dis_mask; /* Pull-Up Disable Mask */ |
162 | int (*setup)(struct i2c_client *client, | 163 | int (*setup)(struct i2c_client *client, |