archive mirror
 help / color / mirror / Atom feed
From: Stephen Rothwell <>
To: Olof Johansson <>, Arnd Bergmann <>,
	Prashant Gaikwad <>,
	Stephen Warren <>,
	Dmitry Torokhov <>
Subject: linux-next: manual merge of the arm-soc tree with the input tree
Date: Mon, 18 Feb 2013 16:01:25 +1100	[thread overview]
Message-ID: <> (raw)

[-- Attachment #1: Type: text/plain, Size: 1163 bytes --]

Hi all,

Today's linux-next merge of the arm-soc tree got a conflict in
drivers/input/keyboard/tegra-kbc.c between commit 9eee07d39fa6 ("Input:
tegra-kbc - require CONFIG_OF, remove platform data") from the input tree
and commit 61fd290d213e ("ARM: tegra: migrate to new clock code") from
the arm-soc tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

Stephen Rothwell          

diff --cc drivers/input/keyboard/tegra-kbc.c
index d89e7d39,54ac1dc..0000000
--- a/drivers/input/keyboard/tegra-kbc.c
+++ b/drivers/input/keyboard/tegra-kbc.c
@@@ -29,16 -29,9 +29,16 @@@
  #include <linux/of.h>
  #include <linux/clk.h>
  #include <linux/slab.h>
 -#include <linux/input/tegra_kbc.h>
 +#include <linux/input/matrix_keypad.h>
- #include <mach/clk.h>
+ #include <linux/clk/tegra.h>
 +#define KBC_MAX_GPIO	24
 +#define KBC_MAX_KPENT	8
 +#define KBC_MAX_ROW	16
 +#define KBC_MAX_COL	8
  #define KBC_MAX_DEBOUNCE_CNT	0x3ffu
  /* KBC row scan time and delay for beginning the row scan. */

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

             reply	other threads:[~2013-02-18  5:01 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-02-18  5:01 Stephen Rothwell [this message]
  -- strict thread matches above, loose matches on Subject: below --
2013-04-16  7:00 linux-next: manual merge of the arm-soc tree with the input tree Stephen Rothwell
2012-09-17  8:02 Stephen Rothwell

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \ \ \ \ \ \ \ \ \ \ \

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).