Fix merge problems

Signed-off-by: Stefan Roese <sr@denx.de>
This commit is contained in:
Stefan Roese
2008-08-06 14:05:38 +02:00
parent 9246f5ecfd
commit f2302d4430
132 changed files with 1173 additions and 1771 deletions

View File

@ -27,6 +27,8 @@
#ifndef __COMMAND_H
#define __COMMAND_H
#include <config.h>
#ifndef NULL
#define NULL 0
#endif