diff options
| author | Anton Vorontsov <anton.vorontsov@linaro.org> | 2012-12-11 22:15:57 -0800 |
|---|---|---|
| committer | Anton Vorontsov <anton.vorontsov@linaro.org> | 2012-12-11 22:15:57 -0800 |
| commit | 76d8a23b127020472207b281427d3e9f4f1227e4 (patch) | |
| tree | e14d7063d96d850fb259115d6fb08cbeb98ccf88 /drivers/gpio/gpio-pxa.c | |
| parent | eba3b670a9166a91be5a11fe33290dca6b9457a2 (diff) | |
| parent | 1ebaf4f4e6912199f8a4e30ba3ab55da2b71bcdf (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux
The merge is merely to fix conflicts before sending a pull request.
Conflicts:
drivers/power/ab8500_btemp.c
drivers/power/ab8500_charger.c
drivers/power/ab8500_fg.c
drivers/power/abx500_chargalg.c
drivers/power/max8925_power.c
Signed-off-by: Anton Vorontsov <anton.vorontsov@linaro.org>
Diffstat (limited to 'drivers/gpio/gpio-pxa.c')
| -rw-r--r-- | drivers/gpio/gpio-pxa.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/gpio/gpio-pxa.c b/drivers/gpio/gpio-pxa.c index 98d52cb3fd1..3e35243c136 100644 --- a/drivers/gpio/gpio-pxa.c +++ b/drivers/gpio/gpio-pxa.c @@ -250,7 +250,7 @@ static int pxa_gpio_of_xlate(struct gpio_chip *gc, } #endif -static int __devinit pxa_init_gpio_chip(int gpio_end, +static int pxa_init_gpio_chip(int gpio_end, int (*set_wake)(unsigned int, unsigned int)) { int i, gpio, nbanks = gpio_to_bank(gpio_end) + 1; @@ -490,7 +490,7 @@ const struct irq_domain_ops pxa_irq_domain_ops = { .xlate = irq_domain_xlate_twocell, }; -static int __devinit pxa_gpio_probe_dt(struct platform_device *pdev) +static int pxa_gpio_probe_dt(struct platform_device *pdev) { int ret, nr_banks, nr_gpios; struct device_node *prev, *next, *np = pdev->dev.of_node; @@ -537,7 +537,7 @@ err: #define pxa_gpio_probe_dt(pdev) (-1) #endif -static int __devinit pxa_gpio_probe(struct platform_device *pdev) +static int pxa_gpio_probe(struct platform_device *pdev) { struct pxa_gpio_chip *c; struct resource *res; |