diff options
| author | Alex Elder <aelder@sgi.com> | 2010-08-02 10:24:57 -0500 |
|---|---|---|
| committer | Alex Elder <aelder@sgi.com> | 2010-08-02 10:24:57 -0500 |
| commit | 6b0a2996a0c023d84bc27ec7528a6e54cb5ea264 (patch) | |
| tree | 9fa9a85d5d871b3cb3c28daf57d8ef8f05becd66 /arch/mips/alchemy/mtx-1/board_setup.c | |
| parent | 209fb87a259ead17e966627b7f053d16a96898da (diff) | |
| parent | 9fe6206f400646a2322096b56c59891d530e8d51 (diff) | |
Merge branch 'v2.6.35'
Diffstat (limited to 'arch/mips/alchemy/mtx-1/board_setup.c')
| -rw-r--r-- | arch/mips/alchemy/mtx-1/board_setup.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/arch/mips/alchemy/mtx-1/board_setup.c b/arch/mips/alchemy/mtx-1/board_setup.c index a9f0336e1f1f..52d883d37dd7 100644 --- a/arch/mips/alchemy/mtx-1/board_setup.c +++ b/arch/mips/alchemy/mtx-1/board_setup.c @@ -67,8 +67,6 @@ static void mtx1_power_off(void) void __init board_setup(void) { - alchemy_gpio2_enable(); - #if defined(CONFIG_USB_OHCI_HCD) || defined(CONFIG_USB_OHCI_HCD_MODULE) /* Enable USB power switch */ alchemy_gpio_direction_output(204, 0); @@ -117,11 +115,11 @@ mtx1_pci_idsel(unsigned int devsel, int assert) if (assert && devsel != 0) /* Suppress signal to Cardbus */ - gpio_set_value(1, 0); /* set EXT_IO3 OFF */ + alchemy_gpio_set_value(1, 0); /* set EXT_IO3 OFF */ else - gpio_set_value(1, 1); /* set EXT_IO3 ON */ + alchemy_gpio_set_value(1, 1); /* set EXT_IO3 ON */ - au_sync_udelay(1); + udelay(1); return 1; } |