Messages in this thread | | | From | Arnd Bergmann <> | Subject | Re: [PATCH 4/9] ARM: omap: add include guard for soc.h | Date | Fri, 15 Feb 2013 12:40:22 +0000 |
| |
On Thursday 14 February 2013, Tony Lindgren wrote: > I left it out intentionally as these are private to mach-omap2, > and I'd like to simplify the indirect includes there further. > So I'd rather just remove the duplicate soc.h from drm.c. > > If people really think this should be applied, I have no > objections to this patch naturally.
The duplicate #include was a result of an automated mismerge between v3.8-rc5 and the omap/multiplatform branch. I have merge v3.8-rc5 into next/multiplatform to resolve this correctly, and pulled in a new omap/multiplatform-fixes branch with patches 6, 7, and 9 from this series.
Arnd
| |