diff --git a/[refs] b/[refs] index ac636d8bfc5c..02ffe64ebdf1 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 9adae9720998c10a882d4c6f9a82527bf8f62d59 +refs/heads/master: 7d0b0a4434dd97d8e0731241aee586460f7fb7bd diff --git a/trunk/arch/sh/boards/mach-migor/setup.c b/trunk/arch/sh/boards/mach-migor/setup.c index dc2ddc2c2d8d..7da0fc94a01e 100644 --- a/trunk/arch/sh/boards/mach-migor/setup.c +++ b/trunk/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));