diff options
author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-09 12:38:44 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-09 12:38:44 -0700 |
commit | 5df3e0d953c8af6f5b96aa090824b929cb5ab599 (patch) | |
tree | 5ec703d42ebd1fa92150d110d4ce47d7891bf2cd /arch/mips/au1000/mtx-1/board_setup.c | |
parent | NLM: Fix a memory leak in nlmsvc_testlock (diff) | |
parent | [MIPS] Au1000: set the PCI controller IO base (diff) | |
download | linux-dev-5df3e0d953c8af6f5b96aa090824b929cb5ab599.tar.xz linux-dev-5df3e0d953c8af6f5b96aa090824b929cb5ab599.zip |
Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus
* 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus:
[MIPS] Au1000: set the PCI controller IO base
[MIPS] Alchemy: Fix USB initialization.
[MIPS] IP32: Fix fatal typo in address computation.
Diffstat (limited to 'arch/mips/au1000/mtx-1/board_setup.c')
-rw-r--r-- | arch/mips/au1000/mtx-1/board_setup.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/mips/au1000/mtx-1/board_setup.c b/arch/mips/au1000/mtx-1/board_setup.c index 7bc5af8917da..2c460c116570 100644 --- a/arch/mips/au1000/mtx-1/board_setup.c +++ b/arch/mips/au1000/mtx-1/board_setup.c @@ -54,11 +54,11 @@ void board_reset (void) void __init board_setup(void) { -#ifdef CONFIG_USB_OHCI +#if defined(CONFIG_USB_OHCI_HCD) || defined(CONFIG_USB_OHCI_HCD_MODULE) // enable USB power switch au_writel( au_readl(GPIO2_DIR) | 0x10, GPIO2_DIR ); au_writel( 0x100000, GPIO2_OUTPUT ); -#endif // defined (CONFIG_USB_OHCI) +#endif /* defined(CONFIG_USB_OHCI_HCD) || defined(CONFIG_USB_OHCI_HCD_MODULE) */ #ifdef CONFIG_PCI #if defined(__MIPSEB__) |