Messages in this thread | | | Date | Thu, 17 Feb 2011 13:10:19 +1100 | From | Stephen Rothwell <> | Subject | linux-next: manual merge of the omap_dss2 tree with the omap tree |
| |
Hi Tomi,
Today's linux-next merge of the omap_dss2 tree got a conflict in arch/arm/mach-omap2/omap_hwmod_2430_data.c between commit 1ae9e33689d1346f7f85845857639a923e0796e3 ("OMAP2430: hwmod data: Add McSPI") from the omap tree and commit 452e3eed4ee6eb8d61b290dad53d48508a3438d8 ("OMAP2430: hwmod data: add DSS DISPC RFBI VENC") from the omap_dss2 tree.
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-omap2/omap_hwmod_2430_data.c index 60fe4aa,1ef3f3f..0000000 --- a/arch/arm/mach-omap2/omap_hwmod_2430_data.c +++ b/arch/arm/mach-omap2/omap_hwmod_2430_data.c @@@ -18,7 -18,7 +18,8 @@@ #include <plat/serial.h> #include <plat/i2c.h> #include <plat/gpio.h> +#include <plat/mcspi.h> + #include <plat/l3_2xxx.h> #include "omap_hwmod_common_data.h"
| |