tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

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

Linus Torvalds e9308cfd 48008296

options
unified split
Changed files
+2 -1
drivers
gpio
gpio-omap.c
gpio-pca953x.c
+1 -1
drivers/gpio/gpio-omap.c
··· 34 34 u16 irq; 35 35 u16 virtual_irq_start; 36 36 int method; 37 - #if defined(CONFIG_ARCH_OMAP16XX) || defined(CONFIG_ARCH_OMAP2PLUS) 38 37 u32 suspend_wakeup; 38 + #if defined(CONFIG_ARCH_OMAP16XX) || defined(CONFIG_ARCH_OMAP2PLUS) 39 39 u32 saved_wakeup; 40 40 #endif 41 41 u32 non_wakeup_gpios;
+1
drivers/gpio/gpio-pca953x.c
··· 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