Hi Russell,
Today's linux-next merge of the arm tree got a conflict in
arch/arm/mach-integrator/integrator_ap.c between commit b71d8429ec36
("mach-integrator: fix VGA base regression") from Linus' tree and commit
b79573586838 ("ARM: 7087/2: mach-integrator: get timer frequency from
clock") from the arm tree.
Just context changes. I fixed it up (see below) and can carry the fix as
necessary.
--
Cheers,
Stephen Rothwell sfr@xxxxxxxxxxxxxxxx
diff --cc arch/arm/mach-integrator/integrator_ap.c
index 8cdc730,c698811..0000000
--- a/arch/arm/mach-integrator/integrator_ap.c
+++ b/arch/arm/mach-integrator/integrator_ap.c
@@@ -32,7 -32,7 +32,8 @@@
#include <linux/interrupt.h>
#include <linux/io.h>
#include <linux/mtd/physmap.h>
+ #include <linux/clk.h>
+#include <video/vga.h>
#include <mach/hardware.h>
#include <mach/platform.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
