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 <hschauhan@nulltrace.org>
This commit is contained in:
Himanshu Chauhan
2011-05-19 19:07:53 +05:30
parent 8bb70d8a90
commit f7dde300d4
41 changed files with 29 additions and 242 deletions

View File

@@ -102,8 +102,6 @@
#ifndef STAND_ALONE
#include <stdio.h>
#else
#include <atom-types.h>
#endif
#include "atom.h"

View File

@@ -92,8 +92,6 @@
#ifndef STAND_ALONE
#include <stdio.h>
#else
#include <atom-types.h>
#endif
#include <string.h>

View File

@@ -91,10 +91,6 @@
#include <stdio.h>
#endif
#ifdef STAND_ALONE
#include <atom-types.h>
#endif
#include "atom.h"
#include "atomsem.h"
#include "atomtimer.h"

View File

@@ -68,8 +68,6 @@
#ifndef STAND_ALONE
#include <stdio.h>
#else
#include <atom-types.h>
#endif
#include "atom.h"