From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Ben Dooks <ben-linux@fluff.org>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Russell King <rmk@arm.linux.org.uk>,
Sebastian Andrzej Siewior <bigeasy@linutronix.de>,
Dirk Brandewie <dirk.brandewie@gmail.com>,
Marek Vasut <marek.vasut@gmail.com>,
Eric Miao <eric.y.miao@gmail.com>
Subject: linux-next: manual merge of the bjdooks-i2c tree with the arm tree
Date: Thu, 6 Jan 2011 13:31:07 +1100 [thread overview]
Message-ID: <20110106133107.463c3e60.sfr@canb.auug.org.au> (raw)
Hi Ben,
Today's linux-next merge of the bjdooks-i2c tree got a conflict in
arch/arm/mach-pxa/pxa27x.c, arch/arm/mach-pxa/pxa3xx.c and
arch/arm/mach-pxa/trizeps4.c between commit
ad68bb9f7a3cd47396635a5e3895215af57579da ("ARM: pxa: Access SMEMC via
virtual addresses") from the arm tree and commit
0a56f28ec486273d84d25571573908344aa67176 ("arm/pxa2xx: reorganize I2C
files") from the bjdooks-i2c tree.
I fixed it up (see below) and can carry the fix as necessary.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
diff --cc arch/arm/mach-pxa/pxa27x.c
index b2130b7,1c77e89..0000000
--- a/arch/arm/mach-pxa/pxa27x.c
+++ b/arch/arm/mach-pxa/pxa27x.c
@@@ -17,9 -17,8 +17,10 @@@
#include <linux/suspend.h>
#include <linux/platform_device.h>
#include <linux/sysdev.h>
+#include <linux/io.h>
+ #include <linux/i2c/pxa-i2c.h>
+#include <asm/mach/map.h>
#include <mach/hardware.h>
#include <asm/irq.h>
#include <mach/irqs.h>
@@@ -29,10 -28,7 +30,8 @@@
#include <mach/ohci.h>
#include <mach/pm.h>
#include <mach/dma.h>
+#include <mach/smemc.h>
- #include <plat/i2c.h>
-
#include "generic.h"
#include "devices.h"
#include "clock.h"
diff --cc arch/arm/mach-pxa/pxa3xx.c
index e14818f,c9d9729..0000000
--- a/arch/arm/mach-pxa/pxa3xx.c
+++ b/arch/arm/mach-pxa/pxa3xx.c
@@@ -21,8 -21,8 +21,9 @@@
#include <linux/irq.h>
#include <linux/io.h>
#include <linux/sysdev.h>
+ #include <linux/i2c/pxa-i2c.h>
+#include <asm/mach/map.h>
#include <mach/hardware.h>
#include <mach/gpio.h>
#include <mach/pxa3xx-regs.h>
@@@ -31,8 -31,6 +32,7 @@@
#include <mach/pm.h>
#include <mach/dma.h>
#include <mach/regs-intc.h>
+#include <mach/smemc.h>
- #include <plat/i2c.h>
#include "generic.h"
#include "devices.h"
diff --cc arch/arm/mach-pxa/trizeps4.c
index 43fc9ca,995e671..0000000
--- a/arch/arm/mach-pxa/trizeps4.c
+++ b/arch/arm/mach-pxa/trizeps4.c
@@@ -47,8 -47,6 +47,7 @@@
#include <mach/mmc.h>
#include <mach/irda.h>
#include <mach/ohci.h>
+#include <mach/smemc.h>
- #include <plat/i2c.h>
#include "generic.h"
#include "devices.h"
next reply other threads:[~2011-01-06 2:31 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-01-06 2:31 Stephen Rothwell [this message]
2011-01-06 3:29 ` Eric Miao
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:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20110106133107.463c3e60.sfr@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=ben-linux@fluff.org \
--cc=bigeasy@linutronix.de \
--cc=dirk.brandewie@gmail.com \
--cc=eric.y.miao@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=marek.vasut@gmail.com \
--cc=rmk@arm.linux.org.uk \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* 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
all inboxes | Powered by JetHome®