Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e9308cfd authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

* '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
parents 48008296 25fcf2b7

drivers/gpio/gpio-omap.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -34,8 +34,8 @@ struct gpio_bank { 
	u16 irq;

	u16 irq;

	u16 virtual_irq_start;

	u16 virtual_irq_start;

	int method;

	int method;

#if defined(CONFIG_ARCH_OMAP16XX) || defined(CONFIG_ARCH_OMAP2PLUS)

	u32 suspend_wakeup;

	u32 suspend_wakeup;

#if defined(CONFIG_ARCH_OMAP16XX) || defined(CONFIG_ARCH_OMAP2PLUS)

	u32 saved_wakeup;

	u32 saved_wakeup;

#endif

#endif

	u32 non_wakeup_gpios;

	u32 non_wakeup_gpios;

drivers/gpio/gpio-pca953x.c

+1 −0
Original line number Original line Diff line number Diff line
@@ -577,6 +577,7 @@ pca953x_get_alt_pdata(struct i2c_client *client, int *gpio_base, int *invert) 
void

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;

}

}

#endif

#endif