Messages in this thread | | | Date | Tue, 25 Sep 2012 16:40:20 +1000 | From | Stephen Rothwell <> | Subject | linux-next: manual merge of the arm-soc tree with the fbdev tree |
| |
Hi all,
Today's linux-next merge of the arm-soc tree got a conflict in drivers/video/msm/mdp_hw.h between commit 8abf0b31e161 ("video: msm: Remove useless mach/* includes") from the fbdev tree and commit 1ef21f6343ff ("ARM: msm: move platform_data definitions") from the arm-soc tree.
I fixed it up (see below) and can carry the fix as necessary (no action is required).
-- Cheers, Stephen Rothwell sfr@canb.auug.org.au
diff --cc drivers/video/msm/mdp_hw.h index 2a84137,a0bacf5..0000000 --- a/drivers/video/msm/mdp_hw.h +++ b/drivers/video/msm/mdp_hw.h @@@ -15,7 -15,8 +15,7 @@@ #ifndef _MDP_HW_H_ #define _MDP_HW_H_ - #include <mach/msm_fb.h> -#include <mach/msm_iomap.h> + #include <linux/platform_data/video-msm_fb.h> struct mdp_info { struct mdp_device mdp_dev; [unhandled content-type:application/pgp-signature] | |