Merge branch 'gpio/merge' of git://git.secretlab.ca/git/linux-2.6

torvalds · torvalds · commit e9308cfd5ab4 · 2011-10-14T17:07:52.000+12:00
* 'gpio/merge' of git://git.secretlab.ca/git/linux-2.6:
  gpio-pca953x: fix gpio_base
  gpio/omap: fix build error with certain OMAP1 configs
diff --git a/drivers/gpio/gpio-omap.c b/drivers/gpio/gpio-omap.c
@@ -34,8 +34,8 @@ struct gpio_bank {
 	u16 irq;
 	u16 virtual_irq_start;
 	int method;
-#if defined(CONFIG_ARCH_OMAP16XX) || defined(CONFIG_ARCH_OMAP2PLUS)
 	u32 suspend_wakeup;
+#if defined(CONFIG_ARCH_OMAP16XX) || defined(CONFIG_ARCH_OMAP2PLUS)
 	u32 saved_wakeup;
 #endif
 	u32 non_wakeup_gpios;
diff --git a/drivers/gpio/gpio-pca953x.c b/drivers/gpio/gpio-pca953x.c
@@ -577,6 +577,7 @@ pca953x_get_alt_pdata(struct i2c_client *client, int *gpio_base, int *invert)
 void
 pca953x_get_alt_pdata(struct i2c_client *client, int *gpio_base, int *invert)
 {
+	*gpio_base = -1;
 }
 #endif
 

Original file line number	Diff line number	Diff line change
`@@ -577,6 +577,7 @@ pca953x_get_alt_pdata(struct i2c_client client, int gpio_base, int *invert)`
`577`	`577`	`void`
`578`	`578`	`pca953x_get_alt_pdata(struct i2c_client client, int gpio_base, int *invert)`
`579`	`579`	`{`
	`580`	`+ *gpio_base = -1;`
`580`	`581`	`}`
`581`	`582`	`#endif`
`582`	`583`