diff options
| author | Markus Klotzbuecher <mk@denx.de> | 2008-10-21 09:18:01 +0200 |
|---|---|---|
| committer | Markus Klotzbuecher <mk@denx.de> | 2008-10-21 09:18:01 +0200 |
| commit | 50bd0057ba8fceeb48533f8b1a652ccd0e170838 (patch) | |
| tree | ea1a183343573c2a48248923b96d316c0956727c /post/drivers/i2c.c | |
| parent | 9dbc366744960013965fce8851035b6141f3b3ae (diff) | |
| parent | f82642e33899766892499b163e60560fbbf87773 (diff) | |
| download | olio-uboot-2014.01-50bd0057ba8fceeb48533f8b1a652ccd0e170838.tar.xz olio-uboot-2014.01-50bd0057ba8fceeb48533f8b1a652ccd0e170838.zip | |
Merge git://git.denx.de/u-boot into x1
Conflicts:
drivers/usb/usb_ohci.c
Diffstat (limited to 'post/drivers/i2c.c')
| -rw-r--r-- | post/drivers/i2c.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/post/drivers/i2c.c b/post/drivers/i2c.c index f54fe9970..b152deaf6 100644 --- a/post/drivers/i2c.c +++ b/post/drivers/i2c.c @@ -39,7 +39,7 @@ #include <post.h> #include <i2c.h> -#if CONFIG_POST & CFG_POST_I2C +#if CONFIG_POST & CONFIG_SYS_POST_I2C int i2c_post_test (int flags) { @@ -88,4 +88,4 @@ int i2c_post_test (int flags) #endif } -#endif /* CONFIG_POST & CFG_POST_I2C */ +#endif /* CONFIG_POST & CONFIG_SYS_POST_I2C */ |