diff options
author | roy zang <tie-fei.zang@freescale.com> | 2007-02-28 16:46:48 +0800 |
---|---|---|
committer | Zang Tiefei <roy@bus.ap.freescale.net> | 2007-02-28 16:46:48 +0800 |
commit | 00b574bdc8c54dbc9e03f63c24f62955d483e3ef (patch) | |
tree | dc49c4219bafd43c2ace6c5a3e6745d7b7264194 /common/ft_build.c | |
parent | 30bddf2c46ab2e824f217a38db033118ac4622af (diff) | |
parent | ccbc7036648e465697ca298ba51e0e76dda352a0 (diff) |
Merge branch 'master' into hpc2
Conflicts:
drivers/Makefile
Fix the merge conflict in file drivers/Makefile
Signed-off-by: Roy Zang <tie-fei.zang@freescale.com>
Diffstat (limited to 'common/ft_build.c')
-rw-r--r-- | common/ft_build.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/common/ft_build.c b/common/ft_build.c index 980e40f55d..5a0575e89a 100644 --- a/common/ft_build.c +++ b/common/ft_build.c @@ -29,6 +29,7 @@ #include <stddef.h> #include <ft_build.h> +#include <linux/ctype.h> #undef DEBUG @@ -180,11 +181,6 @@ void ft_finalize_tree(struct ft_cxt *cxt) { bph->dt_strings_size = cxt->p_end - cxt->p; } -static inline int isprint(int c) -{ - return c >= 0x20 && c <= 0x7e; -} - static int is_printable_string(const void *data, int len) { const char *s = data; |