Merge branch 'master' of git://git.denx.de/u-boot

[platform/kernel/u-boot.git] / include / _exports.h

diff --git a/include/_exports.h b/include/_exports.h
index 0dee05f..8030d70 100644 (file)
--- a/include/_exports.h
+++ b/include/_exports.h
@@ -8,7 +8,7 @@
 #define EXPORT_FUNC(a, b, c, ...)
 #endif
        EXPORT_FUNC(get_version, unsigned long, get_version, void)
-       EXPORT_FUNC(getc, int, getc, void)
+       EXPORT_FUNC(getchar, int, getc, void)
        EXPORT_FUNC(tstc, int, tstc, void)
        EXPORT_FUNC(putc, void, putc, const char)
        EXPORT_FUNC(puts, void, puts, const char *)
@@ -29,7 +29,7 @@
        EXPORT_FUNC(udelay, void, udelay, unsigned long)
        EXPORT_FUNC(get_timer, unsigned long, get_timer, unsigned long)
        EXPORT_FUNC(vprintf, int, vprintf, const char *, va_list)
-       EXPORT_FUNC(do_reset, int, do_reset, cmd_tbl_t *,
+       EXPORT_FUNC(do_reset, int, do_reset, struct cmd_tbl *,
                    int , int , char * const [])
        EXPORT_FUNC(env_get, char  *, env_get, const char*)
        EXPORT_FUNC(env_set, int, env_set, const char *, const char *)
@@ -40,7 +40,7 @@
        EXPORT_FUNC(simple_strtol, long, simple_strtol,
                    const char *, char **, unsigned int)
        EXPORT_FUNC(strcmp, int, strcmp, const char *cs, const char *ct)
-#if defined(CONFIG_CMD_I2C) && !defined(CONFIG_DM_I2C)
+#if defined(CONFIG_CMD_I2C) && !CONFIG_IS_ENABLED(DM_I2C)
        EXPORT_FUNC(i2c_write, int, i2c_write, uchar, uint, int , uchar * , int)
        EXPORT_FUNC(i2c_read, int, i2c_read, uchar, uint, int , uchar * , int)
 #else