diff options
| author | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2014-05-20 10:05:42 +0200 |
|---|---|---|
| committer | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2014-05-20 10:05:42 +0200 |
| commit | 05d134b084590684bcf4d832c0035952727b7cd9 (patch) | |
| tree | 8f5d5fd811634fa621792cad7ca361251c06cd88 /drivers/power | |
| parent | 6130c14605de760bdcaef36b8a0d34eac2a955f0 (diff) | |
| parent | d7782d06534fe4fa47a49fa7c106de5ba85a9687 (diff) | |
| download | u-boot-imx-05d134b084590684bcf4d832c0035952727b7cd9.zip u-boot-imx-05d134b084590684bcf4d832c0035952727b7cd9.tar.gz u-boot-imx-05d134b084590684bcf4d832c0035952727b7cd9.tar.bz2 | |
Merge remote-tracking branch 'u-boot/master'
Conflicts:
boards.cfg
Conflicts were trivial once u-boot-arm/master boards.cfg was
reformatted (commit 6130c146) to match u-boot/master's own
reformatting (commit 1b37fa83).
Diffstat (limited to 'drivers/power')
| -rw-r--r-- | drivers/power/tps6586x.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/power/tps6586x.c b/drivers/power/tps6586x.c index 704c243..d29d969 100644 --- a/drivers/power/tps6586x.c +++ b/drivers/power/tps6586x.c @@ -32,7 +32,7 @@ enum { }; #define MAX_I2C_RETRY 3 -int tps6586x_read(int reg) +static int tps6586x_read(int reg) { int i; uchar data; @@ -61,7 +61,7 @@ exit: return retval; } -int tps6586x_write(int reg, uchar *data, uint len) +static int tps6586x_write(int reg, uchar *data, uint len) { int i; int retval = -1; |