diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-11-25 21:52:55 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-11-25 21:52:55 -0800 |
| commit | 9c3973966fdd3f235466195189eca362557ef098 (patch) | |
| tree | aad91280cc8f4d0629084b726003c4b95134e735 /drivers | |
| parent | caca6a03d365883564885f2c1da3e88dcf65d139 (diff) | |
| parent | 404ba2b8f611bea3228daf031f03901d0c34ecd7 (diff) | |
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()
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/gpio/gpio-pca953x.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpio/gpio-pca953x.c b/drivers/gpio/gpio-pca953x.c index 147df8ae79db..d3f3e8f54561 100644 --- a/drivers/gpio/gpio-pca953x.c +++ b/drivers/gpio/gpio-pca953x.c @@ -546,7 +546,7 @@ static void pca953x_irq_teardown(struct pca953x_chip *chip) * Translate OpenFirmware node properties into platform_data * 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) { struct device_node *node; @@ -574,7 +574,7 @@ pca953x_get_alt_pdata(struct i2c_client *client, int *gpio_base, int *invert) *invert = *val; } #else -void +static void pca953x_get_alt_pdata(struct i2c_client *client, int *gpio_base, int *invert) { *gpio_base = -1; |