diff options
| author | Markus Klotzbuecher <mk@denx.de> | 2008-01-09 12:57:10 (GMT) |
|---|---|---|
| committer | Markus Klotzbuecher <mk@denx.de> | 2008-01-09 12:57:10 (GMT) |
| commit | 6a40ef62c4300e9f606deef0a4618cbc4b514a51 (patch) | |
| tree | c01bdd0e773d092f13af05567fa92fb9072df9e0 /cpu/pxa | |
| parent | 245a362ad3c0c1b84fccc9fec7b623eb14f6e502 (diff) | |
| parent | 07eb02687f008721974a2fb54cd7fdc28033ab3c (diff) | |
| download | u-boot-fsl-qoriq-6a40ef62c4300e9f606deef0a4618cbc4b514a51.tar.xz | |
Merge git://www.denx.de/git/u-boot
Conflicts:
board/tqm5200/tqm5200.c
Diffstat (limited to 'cpu/pxa')
| -rw-r--r-- | cpu/pxa/i2c.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/cpu/pxa/i2c.c b/cpu/pxa/i2c.c index 722d949..92dd19f 100644 --- a/cpu/pxa/i2c.c +++ b/cpu/pxa/i2c.c @@ -457,7 +457,7 @@ int i2c_write(uchar chip, uint addr, int alen, uchar *buffer, int len) uchar i2c_reg_read (uchar chip, uchar reg) { - char buf; + uchar buf; PRINTD(("i2c_reg_read(chip=0x%02x, reg=0x%02x)\n",chip,reg)); i2c_read(chip, reg, 1, &buf, 1); |