diff options
| author | Andy Fleming | 2007-08-03 02:23:23 -0500 |
|---|---|---|
| committer | Andrew Fleming-AFLEMING | 2007-08-03 02:23:23 -0500 |
| commit | 6bf6f114dcdd97ec3f80c2761ed40e31229d6b78 (patch) | |
| tree | 4bc9e1362c3090bb6d2df71109228ca61b8d00ce /include/exports.h | |
| parent | 5a56af3b522ba47fb33a3fee84d23bf1e5429654 (diff) | |
| parent | 5dc210dec5bace98a50b6ba905347890091a9bb0 (diff) | |
Merge branch 'testing' into working
Conflicts:
CHANGELOG
fs/fat/fat.c
include/configs/MPC8560ADS.h
include/configs/pcs440ep.h
net/eth.c
Diffstat (limited to 'include/exports.h')
| -rw-r--r-- | include/exports.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/exports.h b/include/exports.h index 8f7f61703c6..704b1330b89 100644 --- a/include/exports.h +++ b/include/exports.h @@ -23,10 +23,10 @@ void do_reset (void); unsigned long simple_strtoul(const char *cp,char **endp,unsigned int base); char *getenv (char *name); void setenv (char *varname, char *varvalue); -#if (CONFIG_COMMANDS & CFG_CMD_I2C) +#if defined(CONFIG_CMD_I2C) int i2c_write (uchar, uint, int , uchar* , int); int i2c_read (uchar, uint, int , uchar* , int); -#endif /* CFG_CMD_I2C */ +#endif void app_startup(char **); |