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 271eba687c
commit 05bd1987ea
37 changed files with 29 additions and 232 deletions

View File

@@ -27,13 +27,6 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
#ifndef STAND_ALONE
#include <stddef.h>
#else
#include <printk.h>
#include <atom-types.h>
#endif
#include "atom.h"
#include "atomqueue.h"
#include "atomtests.h"