diff options
| author | Scott Wood <scottwood@freescale.com> | 2012-12-14 16:03:55 -0600 |
|---|---|---|
| committer | Scott Wood <scottwood@freescale.com> | 2012-12-14 16:03:55 -0600 |
| commit | 88c5c68ffa277bf01b3254cf5a059e2cbe07be97 (patch) | |
| tree | f56b444a1c85d94d6a386df090def099632489fe /drivers/i2c/mxc_i2c.c | |
| parent | 0b38fffbe413fc0725c750d046ca62c23fca196e (diff) | |
| parent | 6e9005bd96ff0f0548a787ffafee10664a57a8e1 (diff) | |
Merge remote-tracking branch 'origin/master'
Diffstat (limited to 'drivers/i2c/mxc_i2c.c')
| -rw-r--r-- | drivers/i2c/mxc_i2c.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/i2c/mxc_i2c.c b/drivers/i2c/mxc_i2c.c index 18270b9de64..a73b10b9c49 100644 --- a/drivers/i2c/mxc_i2c.c +++ b/drivers/i2c/mxc_i2c.c @@ -115,7 +115,7 @@ static uint8_t i2c_imx_get_clk(unsigned int rate) /* * Set I2C Bus speed */ -int bus_i2c_set_bus_speed(void *base, int speed) +static int bus_i2c_set_bus_speed(void *base, int speed) { struct mxc_i2c_regs *i2c_regs = (struct mxc_i2c_regs *)base; u8 clk_idx = i2c_imx_get_clk(speed); @@ -133,7 +133,7 @@ int bus_i2c_set_bus_speed(void *base, int speed) /* * Get I2C Speed */ -unsigned int bus_i2c_get_bus_speed(void *base) +static unsigned int bus_i2c_get_bus_speed(void *base) { struct mxc_i2c_regs *i2c_regs = (struct mxc_i2c_regs *)base; u8 clk_idx = readb(&i2c_regs->ifdr); |