diff --git a/[refs] b/[refs] index d84f878bb215..688eed2e43c6 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 691e06c0ff2cd0cfe79db5c52baac4fe18ca55af +refs/heads/master: 8805f410e4fb88a56552c1af42d61b38837a38fd diff --git a/trunk/drivers/gpio/gpio-omap.c b/trunk/drivers/gpio/gpio-omap.c index c48de8ffe9ef..7cbad8569268 100644 --- a/trunk/drivers/gpio/gpio-omap.c +++ b/trunk/drivers/gpio/gpio-omap.c @@ -973,7 +973,7 @@ static void omap_gpio_mod_init(struct gpio_bank *bank) _gpio_rmw(base, bank->regs->ctrl, 0, 1); } -static __init void +static __devinit void omap_mpuio_alloc_gc(struct gpio_bank *bank, unsigned int irq_start, unsigned int num) {