* Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> [091119 18:01]:
> Hi Tony,
>
> I think commit 8552f084d80cfc191ea5affacbeffe44e8629496 ("ARM OMAP3:
> RX-51 board - add initialization of gpio keys") has been misapplied. It
> has this line:
>
> +#endif /* CONFIG_KEYBOARD_GPIO || CONFIG_KEYBOARD_GPIO_MODULE */
>
> with the leading '+'. I noticed this when merging with the input tree
> as this made for a strange looking conflict.
Oops, my fault. Will fix ASAP.
Regards,
Tony
--
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
