Messages in this thread | | | Date | Fri, 20 Nov 2009 12:57:33 -0800 | From | Tony Lindgren <> | Subject | Re: linux-next: omap tree misaplied patch |
| |
* Stephen Rothwell <sfr@canb.auug.org.au> [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
| |