Messages in this thread | | | Date | Wed, 28 Dec 2011 16:00:45 +1100 | From | Stephen Rothwell <> | Subject | linux-next: manual merge of the driver-core tree with the s5p tree |
| |
Hi Greg,
Today's linux-next merge of the driver-core tree got a conflict in arch/arm/mach-exynos/cpu.c between commit f983575aa90c ("ARM: EXYNOS: Enable conversion of GIC dt irq specifier to linux virq") from the s5p tree and commit 4a858cfc9af8 ("arm: convert sysdev_class to a regular subsystem") from the driver-core tree.
Just context changes. 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-exynos/cpu.c index 0e3f42b,d4c41f3..0000000 --- a/arch/arm/mach-exynos/cpu.c +++ b/arch/arm/mach-exynos/cpu.c @@@ -9,9 -9,7 +9,9 @@@ */ #include <linux/sched.h> - #include <linux/sysdev.h> + #include <linux/device.h> +#include <linux/of.h> +#include <linux/of_irq.h> #include <asm/mach/map.h> #include <asm/mach/irq.h> [unhandled content-type:application/pgp-signature] | |