From c7bc5cf3964be87de53a353838a55f136302ef22 Mon Sep 17 00:00:00 2001 From: Himanshu Chauhan Date: Thu, 19 May 2011 19:07:53 +0530 Subject: [PATCH] Change related to upstream merge. * STAND_ALONE conditional compilation is removed. * Previous interim commits are squashed. * printk.h is included from atomport.h * atom-types.h and atommport-types.h have been removed. Signed-off-by: Himanshu Chauhan --- kernel/atomsem.c | 6 ++++++ tests/test-template.c | 1 - 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/kernel/atomsem.c b/kernel/atomsem.c index db1c2be..9d1bab5 100755 --- a/kernel/atomsem.c +++ b/kernel/atomsem.c @@ -87,6 +87,12 @@ * */ +<<<<<<< HEAD +======= +#ifndef STAND_ALONE +#include +#endif +>>>>>>> Change related to upstream merge. #include "atom.h" #include "atomsem.h" diff --git a/tests/test-template.c b/tests/test-template.c index 9f00f38..449af59 100644 --- a/tests/test-template.c +++ b/tests/test-template.c @@ -31,7 +31,6 @@ #include "atom.h" #include "atomtests.h" - /** * \b test_start *