On Thu, Jan 6, 2011 at 10:31 AM, Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> wrote:
> 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.
Thanks Stephen, that looks sane to me.
> --
> Cheers,
> Stephen Rothwell          Âsfr@xxxxxxxxxxxxxxxx
>
> 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"
>
--
To unsubscribe from this list: send the line "unsubscribe linux-next" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
