Messages in this thread | | | Date | Fri, 11 Nov 2011 14:10:31 +0530 | Subject | Re: linux-next: manual merge of the input tree with the s5p tree | From | Thomas Abraham <> |
| |
Hi Dmitry,
On 11 November 2011 09:11, Dmitry Torokhov <dmitry.torokhov@gmail.com> wrote: > Hi Stephen, > > On Thursday, November 10, 2011 06:11:59 PM Stephen Rothwell wrote: >> Hi Dmitry, >> >> Today's linux-next merge of the input tree got a conflict in >> drivers/input/keyboard/Kconfig between commit 007205aa47e9 ("input: >> samsung-keypad: Add HAVE_SAMSUNG_KEYPAD config option") from the s5p >> tree and commit 5862c02d745f ("Input: samsung-keypad - enable compiling >> on other platforms") from the input tree. >> >> I have fixed it up (probably incorrectly - see below) and can carry the >> fix as necessary. > > Please drop the whole HAVE_SAMSUNG_KEYPAD thing; HAVE_CLK is all > this driver needs. Expanding beyond Samsung will allow greater > compile coverage.
Thanks for the suggestion. I will modify device tree support for samsung keypad driver that is merged in s5p tree for-next branch.
Regards, Thomas.
> > Thanks. > > -- > Dmitry >
| |