atheros/patches-2.6.35: sync patches against 2.6.35-rc6
[openwrt.git] / target / linux / au1000 / patches-2.6.34 / 004-mtx1_fix_pci.patch
1 --- a/arch/mips/alchemy/mtx-1/board_setup.c
2 +++ b/arch/mips/alchemy/mtx-1/board_setup.c
3 @@ -67,7 +67,6 @@ static void mtx1_power_off(void)
4
5 void __init board_setup(void)
6 {
7 - alchemy_gpio2_enable();
8
9 #if defined(CONFIG_USB_OHCI_HCD) || defined(CONFIG_USB_OHCI_HCD_MODULE)
10 /* Enable USB power switch */
11 @@ -107,21 +106,13 @@ void __init board_setup(void)
12 int
13 mtx1_pci_idsel(unsigned int devsel, int assert)
14 {
15 -#define MTX_IDSEL_ONLY_0_AND_3 0
16 -#if MTX_IDSEL_ONLY_0_AND_3
17 - if (devsel != 0 && devsel != 3) {
18 - printk(KERN_ERR "*** not 0 or 3\n");
19 - return 0;
20 - }
21 -#endif
22 -
23 if (assert && devsel != 0)
24 /* Suppress signal to Cardbus */
25 gpio_set_value(1, 0); /* set EXT_IO3 OFF */
26 else
27 gpio_set_value(1, 1); /* set EXT_IO3 ON */
28
29 - au_sync_udelay(1);
30 + udelay(1);
31 return 1;
32 }
33
This page took 0.039458 seconds and 5 git commands to generate.