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. -- Cheers, Stephen Rothwell sfr@xxxxxxxxxxxxxxxx http://www.canb.auug.org.au/~sfr/
Attachment:
pgpA1DeUF7XHv.pgp
Description: PGP signature