Hi Russell,
Today's linux-next merge of the arm tree got conflicts in
arch/arm/mach-integrator/core.c and arch/arm/mach-integrator/pci.c
between commit 9f97da78bf01 ("Disintegrate asm/system.h for ARM") from
Linus' tree and commit 695436e3738e ("ARM: 7349/1: integrator: convert to
sparse irqs") from the arm tree.
I fixed it up (see below) and can carry the fix as necessary.
--
Cheers,
Stephen Rothwell sfr@xxxxxxxxxxxxxxxx
diff --cc arch/arm/mach-integrator/core.c
index 1a65d77,304dfb2..0000000
--- a/arch/arm/mach-integrator/core.c
+++ b/arch/arm/mach-integrator/core.c
@@@ -25,8 -25,10 +25,9 @@@
#include <mach/hardware.h>
#include <mach/platform.h>
- #include <asm/irq.h>
#include <mach/cm.h>
+ #include <mach/irqs.h>
+
-#include <asm/system.h>
#include <asm/leds.h>
#include <asm/mach-types.h>
#include <asm/mach/time.h>
diff --cc arch/arm/mach-integrator/pci.c
index 36068f4,e15aa43..0000000
--- a/arch/arm/mach-integrator/pci.c
+++ b/arch/arm/mach-integrator/pci.c
@@@ -26,7 -26,7 +26,6 @@@
#include <linux/interrupt.h>
#include <linux/init.h>
- #include <asm/irq.h>
-#include <asm/system.h>
#include <asm/mach/pci.h>
#include <asm/mach-types.h>
Attachment:
pgpdQEtPv_WVO.pgp
Description: PGP signature
