diff options
| author | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
|---|---|---|
| committer | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
| commit | c71c03bda1e86c9d5198c5d83f712e695c4f2a1e (patch) | |
| tree | ecb166cb3e2b7e2adb3b5e292245fefd23381ac8 /drivers/i2c/busses/i2c-sh7760.c | |
| parent | ea53c912f8a86a8567697115b6a0d8152beee5c8 (diff) | |
| parent | 6a00f206debf8a5c8899055726ad127dbeeed098 (diff) | |
Merge branch 'mpi-master' into wip-k-fmlpwip-k-fmlp
Conflicts:
litmus/sched_cedf.c
Diffstat (limited to 'drivers/i2c/busses/i2c-sh7760.c')
| -rw-r--r-- | drivers/i2c/busses/i2c-sh7760.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/i2c/busses/i2c-sh7760.c b/drivers/i2c/busses/i2c-sh7760.c index 4f93da31d3ad..3cad8fecc3d3 100644 --- a/drivers/i2c/busses/i2c-sh7760.c +++ b/drivers/i2c/busses/i2c-sh7760.c | |||
| @@ -101,12 +101,12 @@ struct cami2c { | |||
| 101 | 101 | ||
| 102 | static inline void OUT32(struct cami2c *cam, int reg, unsigned long val) | 102 | static inline void OUT32(struct cami2c *cam, int reg, unsigned long val) |
| 103 | { | 103 | { |
| 104 | ctrl_outl(val, (unsigned long)cam->iobase + reg); | 104 | __raw_writel(val, (unsigned long)cam->iobase + reg); |
| 105 | } | 105 | } |
| 106 | 106 | ||
| 107 | static inline unsigned long IN32(struct cami2c *cam, int reg) | 107 | static inline unsigned long IN32(struct cami2c *cam, int reg) |
| 108 | { | 108 | { |
| 109 | return ctrl_inl((unsigned long)cam->iobase + reg); | 109 | return __raw_readl((unsigned long)cam->iobase + reg); |
| 110 | } | 110 | } |
| 111 | 111 | ||
| 112 | static irqreturn_t sh7760_i2c_irq(int irq, void *ptr) | 112 | static irqreturn_t sh7760_i2c_irq(int irq, void *ptr) |