Re: linux-next: manual merge of the trivial tree with the arm tree

[Jiri Kosina]

On Wed, 25 Nov 2009, Stephen Rothwell wrote:

> Today's linux-next merge of the trivial tree got a conflict in
> arch/arm/plat-mxc/include/mach/mx2x.h between commit
> b9fc90a48a3d1794443e095d8585dcaeafb2195f ("imx: add namespace prefixes
> for symbols in mx2x.h") from the arm tree and commit
> 324bea84dda5e6ddea9464cdd957cb8cf94552d9 ("tree-wide: fix typos "offest"
> -> "offset"") from the trivial tree.
> 
> Just context changes.  I fixed it up (see below) and can carry the fix as
> necessary.

Thanks. Probably the easiest way here is to hand it over to Russel.

I have dropped it from my tree -- Russel, please consider applying the 
patch below. Thanks.


From: Uwe Kleine-König <u.kleine-koenig@xxxxxxxxxxxxxx>
Subject: [PATCH] arm: fix "offest" -> "offset" typo

Signed-off-by: Uwe Kleine-König <u.kleine-koenig@xxxxxxxxxxxxxx>
Signed-off-by: Jiri Kosina <jkosina@xxxxxxx>

diff --git a/arch/arm/plat-mxc/include/mach/mx2x.h b/arch/arm/plat-mxc/include/mach/mx2x.h
index db5d921..728f31c 100644
--- a/arch/arm/plat-mxc/include/mach/mx2x.h
+++ b/arch/arm/plat-mxc/include/mach/mx2x.h
@@ -25,7 +25,7 @@
 
 /* The following addresses are common between i.MX21 and i.MX27 */
 
-/* Register offests */
+/* Register offsets */
 #define AIPI_BASE_ADDR          0x10000000
 #define AIPI_BASE_ADDR_VIRT     0xF4000000
 #define AIPI_SIZE               SZ_1M

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/