| Message ID | 1395162964-5916-4-git-send-email-t.figa@samsung.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On 03/19/14 02:16, Tomasz Figa wrote: > Recent Samsung header clean-up series did heavy reorganization of > various Samsung-specific headers, unfortunately causing a conflict with > Samsung PM consolidation series part 2 - multiplatform) and resulting > with a merge error that caused a build failure, due to a missing header > being included. > > This patch fixes this by removing incorrect header inclusion. > > Signed-off-by: Tomasz Figa<t.figa@samsung.com> > --- > arch/arm/plat-samsung/pm-debug.c | 1 - > 1 file changed, 1 deletion(-) > > diff --git a/arch/arm/plat-samsung/pm-debug.c b/arch/arm/plat-samsung/pm-debug.c > index 602998b..88bb4cf 100644 > --- a/arch/arm/plat-samsung/pm-debug.c > +++ b/arch/arm/plat-samsung/pm-debug.c > @@ -20,7 +20,6 @@ > > #include<plat/cpu.h> > #include<plat/pm-common.h> > -#include<plat/regs-serial.h> > > #ifdef CONFIG_SAMSUNG_ATAGS > #include<mach/pm-core.h> OK, applied into s2r-pm-samsung-2 branch. Thanks, Kukjin
diff --git a/arch/arm/plat-samsung/pm-debug.c b/arch/arm/plat-samsung/pm-debug.c index 602998b..88bb4cf 100644 --- a/arch/arm/plat-samsung/pm-debug.c +++ b/arch/arm/plat-samsung/pm-debug.c @@ -20,7 +20,6 @@ #include <plat/cpu.h> #include <plat/pm-common.h> -#include <plat/regs-serial.h> #ifdef CONFIG_SAMSUNG_ATAGS #include <mach/pm-core.h>
Recent Samsung header clean-up series did heavy reorganization of various Samsung-specific headers, unfortunately causing a conflict with Samsung PM consolidation series part 2 - multiplatform) and resulting with a merge error that caused a build failure, due to a missing header being included. This patch fixes this by removing incorrect header inclusion. Signed-off-by: Tomasz Figa <t.figa@samsung.com> --- arch/arm/plat-samsung/pm-debug.c | 1 - 1 file changed, 1 deletion(-)