From 04ed523633082c0bc49fd23f8424bdf1523b1ec4 Mon Sep 17 00:00:00 2001 From: Peter Zotov Date: Thu, 7 Apr 2011 14:11:22 +0400 Subject: [PATCH] Rename config.h to app_config.h, as old name conflicts with autoconf. --- include/{config.h => app_config.h} | 0 src/config.c | 2 +- src/ingenic.c | 2 +- src/shell_builtins.c | 2 +- src/spl_cmdset.c | 2 +- src/usbboot_cmdset.c | 4 ++-- 6 files changed, 6 insertions(+), 6 deletions(-) rename include/{config.h => app_config.h} (100%) diff --git a/include/config.h b/include/app_config.h similarity index 100% rename from include/config.h rename to include/app_config.h diff --git a/src/config.c b/src/config.c index cc94566..d58294c 100644 --- a/src/config.c +++ b/src/config.c @@ -21,7 +21,7 @@ #include #include -#include "config.h" +#include "app_config.h" #include "debug.h" char **cfg_environ = NULL; diff --git a/src/ingenic.c b/src/ingenic.c index 02989fe..60f8096 100644 --- a/src/ingenic.c +++ b/src/ingenic.c @@ -27,7 +27,7 @@ #include "ingenic.h" #include "usbdev.h" #include "debug.h" -#include "config.h" +#include "app_config.h" #define HANDLE ingenic_handle_t *handle = hndl #define BUILDTYPE(cmdset, id) (((cmdset) << 16) | (0x##id & 0xFFFF)) diff --git a/src/shell_builtins.c b/src/shell_builtins.c index 8f7f534..e85fb40 100644 --- a/src/shell_builtins.c +++ b/src/shell_builtins.c @@ -24,7 +24,7 @@ #include #include "shell.h" -#include "config.h" +#include "app_config.h" #include "ingenic.h" static int builtin_help(shell_context_t *ctx, int argc, char *argv[]); diff --git a/src/spl_cmdset.c b/src/spl_cmdset.c index b988c61..76a3c77 100644 --- a/src/spl_cmdset.c +++ b/src/spl_cmdset.c @@ -23,7 +23,7 @@ #include #include "shell.h" -#include "config.h" +#include "app_config.h" #include "ingenic.h" static int spl_memtest(shell_context_t *ctx, int argc, char *argv[]); diff --git a/src/usbboot_cmdset.c b/src/usbboot_cmdset.c index 86c94b2..4296456 100644 --- a/src/usbboot_cmdset.c +++ b/src/usbboot_cmdset.c @@ -21,9 +21,9 @@ #include #include "shell.h" -#include "config.h" +#include "app_config.h" #include "ingenic.h" -#include "config.h" +#include static int usbboot_boot(shell_context_t *ctx, int argc, char *argv[]); static int usbboot_load(shell_context_t *ctx, int argc, char *argv[]);