diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2010-03-02 03:52:28 +0100 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2010-03-02 03:52:28 +0100 |
| commit | 7d0b0a4434dd97d8e0731241aee586460f7fb7bd (patch) | |
| tree | e0ef5dfb56c2fe65e65162bfb5ccd2074664913f /arch/sh/boards/mach-migor | |
| parent | Merge branches 'sh/dmaengine', 'sh/hw-breakpoints' and 'sh/trivial' (diff) | |
| download | linux-7d0b0a4434dd97d8e0731241aee586460f7fb7bd.tar.xz linux-7d0b0a4434dd97d8e0731241aee586460f7fb7bd.zip | |
sh: Fix up ctrl_read/write stragglers in migor setup.
ctrl_read/writeX are deprecated, this converts them over to their
__raw_read/write() counterparts.
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Diffstat (limited to 'arch/sh/boards/mach-migor')
| -rw-r--r-- | arch/sh/boards/mach-migor/setup.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/sh/boards/mach-migor/setup.c b/arch/sh/boards/mach-migor/setup.c index dc2ddc2c2d8d..7da0fc94a01e 100644 --- a/arch/sh/boards/mach-migor/setup.c +++ b/arch/sh/boards/mach-migor/setup.c @@ -633,7 +633,7 @@ static int __init migor_devices_setup(void) * The original driver sets SIUB OLR/OBT, ILR/IBT, and SIUA OLR/OBT to * output. Need only SIUB, set to output for master mode (table 34.2) */ - ctrl_outw(ctrl_inw(PORT_MSELCRA) | 1, PORT_MSELCRA); + __raw_writew(__raw_readw(PORT_MSELCRA) | 1, PORT_MSELCRA); i2c_register_board_info(0, migor_i2c_devices, ARRAY_SIZE(migor_i2c_devices)); |