Commit 9c397396 authored by Linus Torvalds's avatar Linus Torvalds

Merge branch 'gpio-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson

* 'gpio-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson:
  gpio: pca953x: Staticise pca953x_get_altdata()
parents caca6a03 404ba2b8
...@@ -546,7 +546,7 @@ static void pca953x_irq_teardown(struct pca953x_chip *chip) ...@@ -546,7 +546,7 @@ static void pca953x_irq_teardown(struct pca953x_chip *chip)
* Translate OpenFirmware node properties into platform_data * Translate OpenFirmware node properties into platform_data
* WARNING: This is DEPRECATED and will be removed eventually! * WARNING: This is DEPRECATED and will be removed eventually!
*/ */
void static void
pca953x_get_alt_pdata(struct i2c_client *client, int *gpio_base, int *invert) pca953x_get_alt_pdata(struct i2c_client *client, int *gpio_base, int *invert)
{ {
struct device_node *node; struct device_node *node;
...@@ -574,7 +574,7 @@ pca953x_get_alt_pdata(struct i2c_client *client, int *gpio_base, int *invert) ...@@ -574,7 +574,7 @@ pca953x_get_alt_pdata(struct i2c_client *client, int *gpio_base, int *invert)
*invert = *val; *invert = *val;
} }
#else #else
void static void
pca953x_get_alt_pdata(struct i2c_client *client, int *gpio_base, int *invert) pca953x_get_alt_pdata(struct i2c_client *client, int *gpio_base, int *invert)
{ {
*gpio_base = -1; *gpio_base = -1;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment