Re: linux-next: Tree for Feb 27 (gpio-sodaville.c)

[Stephen Rothwell]

On Mon, 27 Feb 2012 09:56:21 -0800 Randy Dunlap <rdunlap@xxxxxxxxxxxx> wrote:
>
> on i386:
> 
> drivers/gpio/gpio-sodaville.c:130:2: error: unknown field 'dt_translate' specified in initializer
> drivers/gpio/gpio-sodaville.c:130:2: warning: initialization from incompatible pointer type
> drivers/gpio/gpio-sodaville.c: In function 'sdv_register_irqsupport':
> drivers/gpio/gpio-sodaville.c:152:8: error: 'struct irq_domain' has no member named 'irq_base'
> drivers/gpio/gpio-sodaville.c:182:2: error: implicit declaration of function 'irq_domain_add'
> drivers/gpio/gpio-sodaville.c: In function 'sdv_gpio_remove':
> drivers/gpio/gpio-sodaville.c:263:2: error: implicit declaration of function 'irq_domain_del'

These are a conflicts between the gio tree and the irqdomain tree.
Grant, can you supply me with a merge fix patch?  Or will you merge the
irqdomain stuff into the gpio tree (making sure that the irqdomain tree
never rebases again) ...

-- 
Cheers,
Stephen Rothwell                    sfr@xxxxxxxxxxxxxxxx

Attachment: pgp00000.pgp
Description: PGP signature