Hi Andrew,
Today's linux-next merge of the akpm tree got a conflict in
arch/arm/mach-s3c64xx/common.c between commit cae36a5ce9c9 ("ARM:
SAMSUNG: Set PWM platform data") from the samsung tree and commit
"reboot: arm: change reboot_mode to use enum reboot_mode" from the akpm
tree.I fixed it up (see below) and can carry the fix as necessary (no action is required). -- Cheers, Stephen Rothwell [email protected] diff --cc arch/arm/mach-s3c64xx/common.c index 0b33683,54f4a05..0000000 --- a/arch/arm/mach-s3c64xx/common.c +++ b/arch/arm/mach-s3c64xx/common.c @@@ -26,7 -26,7 +26,8 @@@ #include <linux/irq.h> #include <linux/gpio.h> #include <linux/irqchip/arm-vic.h> + #include <linux/reboot.h> +#include <clocksource/samsung_pwm.h> #include <asm/mach/arch.h> #include <asm/mach/map.h>
pgpTuBFZczPkW.pgp
Description: PGP signature
