On Mon, Feb 27, 2012 at 4:40 PM, Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> wrote: > 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) ... The irqdomain branch has already been made stable for that exact reason with other trees. I'll get it fixed up and send out an update. I've got 4 hours on a plane tomorrow, so I'll probably crank it out then. g. -- To unsubscribe from this list: send the line "unsubscribe linux-next" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
