Hi,
On 27/03/2008, Eduardo Valentin <edubezval@xxxxxxxxx> wrote:
> From: Eduardo Valentin <eduardo.valentin@xxxxxxxxxxx>
>
> Signed-off-by: Eduardo Valentin <eduardo.valentin@xxxxxxxxxxx>
> ---
> arch/arm/mach-omap1/board-palmte.c | 2 +-
> arch/arm/mach-omap1/board-palmz71.c | 2 +-
> 2 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/arch/arm/mach-omap1/board-palmte.c b/arch/arm/mach-omap1/board-palmte.c
> index 63c3131..f4860b0 100644
> --- a/arch/arm/mach-omap1/board-palmte.c
> +++ b/arch/arm/mach-omap1/board-palmte.c
> @@ -64,7 +64,7 @@ static const int palmte_keymap[] = {
> KEY(1, 1, KEY_DOWN),
> KEY(1, 2, KEY_UP),
> KEY(1, 3, KEY_RIGHT),
> - KEY(1, 4, KEY_CENTER),
> + KEY(1, 4, KEY_ENTER),
I'm not sure if the disappearance of KEY_CENTER in
include/linux/input.h was intended or accidental. I can't find the
exact commitdiff that removed it, in either gitweb or gitview. It can
be seen in gitweb that the tree in this commit still has it (after a
bit merge) http://git.kernel.org/?p=linux/kernel/git/tmlind/linux-omap-2.6.git;a=commit;h=dd1d9a62f7cd60b544013eb429d6a3137617f0b2
and the following commit:
http://git.kernel.org/?p=linux/kernel/git/tmlind/linux-omap-2.6.git;a=commit;h=5517853712f1f6daac8a7b2590f9b821e767aa13
has no KEY_CENTER. Is that a merge conflict?
--
Please do not print this email unless absolutely necessary. Spread
environmental awareness.
--
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
