Hello, the diff between l-o and mainline are these commits regarding to omap-keypad.c: commit fdee8764947cde1e6933e7d981ce5b9de00e83e6 Author: Tony Lindgren <tony@xxxxxxxxxxx> Merge current mainline tree into linux-omap tree commit ed39c59ff267249e7e789ea3bb64afc1e9afb5bd Author: Russell King <rmk@xxxxxxxxxxxxxxxxxxxxxxx> omap: fix a load of "warning: symbol 'xxx' was not declared. Should it be static?" commit e85a9daa48453a4e7ffedf174b4358cdb444fbbb Author: David Brownell <dbrownell@xxxxxxxxxxxxxxxxxxxxx> some drivers switch away from OMAP-specific GPIO calls Should I take the relevant parts from these commits and send it to linux-input? Also there are other things broken in the omap-keypad driver. One thing came to my mind is in the omap_kp_enable_store: No matter what platform the code is running it tries to enable/disable IRQ number 33 (IH2_BASE + 1), which is not a nice thing to do... Péter On Thursday 02 October 2008 09:12:39 ext Tony Lindgren wrote: > * Peter Ujfalusi <peter.ujfalusi@xxxxxxxxx> [081002 08:29]: > > Fixes for the omap-keypad driver on OMAP2 > > > > Peter Ujfalusi (2) > > OMAP2: omap-keypad: interrupt disable fix > > OMAP2: omap-keypad: Enable more than 6 rows > > > > drivers/input/keyboard/omap-keypad.c | 6 +----- > > 1 files changed, 1 insertions(+), 5 deletions(-) > > Looks good to me, here's my ack: > > Acked-by: Tony Lindgren <tony@xxxxxxxxxxx> > > Can you please send your series to linux-input@xxxxxxxxxxxxxxx > for inclusion into the mainline kernel? Also cc linux-omap list. > > You might also want to also include other pending patches sitting in > linux-omap into your series so we get this driver into sync with > mainline too. > > Thanks, > > Tony > -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
