From: "Paolo 'Blaisorblade' Giarrusso" Finish the rename of CONFIG_USB_OHCI to CONFIG_USB_OHCI_HCD, which started in 2005 (before 2.6.12-rc2). The patch in this message has not been applied yet; moreover, it is not something to fix afterwards. I've verified that no more instances of 'CONFIG_USB_[UOE]HCI\>' exist in the source tree. http://www.linux-mips.org/archives/linux-mips/2005-06/msg00060.html I'm also sending a script to detect undefined Kconfig variables in next patch. Thanks to my colleague Giuseppe Patanè for the original report: he discovered the original mail (above) and for verified that the fix had not yet been applied. Cc: Giuseppe Patanè Cc: Ralf Baechle Signed-off-by: Paolo 'Blaisorblade' Giarrusso Signed-off-by: Andrew Morton --- arch/mips/au1000/mtx-1/board_setup.c | 4 ++-- arch/mips/au1000/pb1000/board_setup.c | 6 +++--- arch/mips/au1000/pb1100/board_setup.c | 4 ++-- arch/mips/au1000/pb1500/board_setup.c | 6 +++--- 4 files changed, 10 insertions(+), 10 deletions(-) diff -puN arch/mips/au1000/mtx-1/board_setup.c~mips-replace-config_usb_ohci-with-config_usb_ohci_hcd-in-a-few-overlooked-files arch/mips/au1000/mtx-1/board_setup.c --- a/arch/mips/au1000/mtx-1/board_setup.c~mips-replace-config_usb_ohci-with-config_usb_ohci_hcd-in-a-few-overlooked-files +++ a/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 +#ifdef CONFIG_USB_OHCI_HCD // 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) #ifdef CONFIG_PCI #if defined(__MIPSEB__) diff -puN arch/mips/au1000/pb1000/board_setup.c~mips-replace-config_usb_ohci-with-config_usb_ohci_hcd-in-a-few-overlooked-files arch/mips/au1000/pb1000/board_setup.c --- a/arch/mips/au1000/pb1000/board_setup.c~mips-replace-config_usb_ohci-with-config_usb_ohci_hcd-in-a-few-overlooked-files +++ a/arch/mips/au1000/pb1000/board_setup.c @@ -54,7 +54,7 @@ void __init board_setup(void) au_writel(0, SYS_PINSTATERD); udelay(100); -#ifdef CONFIG_USB_OHCI +#ifdef CONFIG_USB_OHCI_HCD /* zero and disable FREQ2 */ sys_freqctrl = au_readl(SYS_FREQCTRL0); sys_freqctrl &= ~0xFFF00000; @@ -102,7 +102,7 @@ void __init board_setup(void) /* * Route 48MHz FREQ2 into USB Host and/or Device */ -#ifdef CONFIG_USB_OHCI +#ifdef CONFIG_USB_OHCI_HCD sys_clksrc |= ((4<<12) | (0<<11) | (0<<10)); #endif au_writel(sys_clksrc, SYS_CLKSRC); @@ -116,7 +116,7 @@ void __init board_setup(void) au_writel(pin_func, SYS_PINFUNC); au_writel(0x2800, SYS_TRIOUTCLR); au_writel(0x0030, SYS_OUTPUTCLR); -#endif // defined (CONFIG_USB_OHCI) +#endif // defined (CONFIG_USB_OHCI_HCD) // make gpio 15 an input (for interrupt line) pin_func = au_readl(SYS_PINFUNC) & (u32)(~0x100); diff -puN arch/mips/au1000/pb1100/board_setup.c~mips-replace-config_usb_ohci-with-config_usb_ohci_hcd-in-a-few-overlooked-files arch/mips/au1000/pb1100/board_setup.c --- a/arch/mips/au1000/pb1100/board_setup.c~mips-replace-config_usb_ohci-with-config_usb_ohci_hcd-in-a-few-overlooked-files +++ a/arch/mips/au1000/pb1100/board_setup.c @@ -54,7 +54,7 @@ void __init board_setup(void) au_writel(0, SYS_PININPUTEN); udelay(100); -#ifdef CONFIG_USB_OHCI +#ifdef CONFIG_USB_OHCI_HCD { u32 pin_func, sys_freqctrl, sys_clksrc; @@ -98,7 +98,7 @@ void __init board_setup(void) pin_func |= 0x8000; au_writel(pin_func, SYS_PINFUNC); } -#endif // defined (CONFIG_USB_OHCI) +#endif // defined (CONFIG_USB_OHCI_HCD) /* Enable sys bus clock divider when IDLE state or no bus activity. */ au_writel(au_readl(SYS_POWERCTRL) | (0x3 << 5), SYS_POWERCTRL); diff -puN arch/mips/au1000/pb1500/board_setup.c~mips-replace-config_usb_ohci-with-config_usb_ohci_hcd-in-a-few-overlooked-files arch/mips/au1000/pb1500/board_setup.c --- a/arch/mips/au1000/pb1500/board_setup.c~mips-replace-config_usb_ohci-with-config_usb_ohci_hcd-in-a-few-overlooked-files +++ a/arch/mips/au1000/pb1500/board_setup.c @@ -56,7 +56,7 @@ void __init board_setup(void) au_writel(0, SYS_PINSTATERD); udelay(100); -#ifdef CONFIG_USB_OHCI +#ifdef CONFIG_USB_OHCI_HCD /* GPIO201 is input for PCMCIA card detect */ /* GPIO203 is input for PCMCIA interrupt request */ @@ -85,7 +85,7 @@ void __init board_setup(void) /* * Route 48MHz FREQ2 into USB Host and/or Device */ -#ifdef CONFIG_USB_OHCI +#ifdef CONFIG_USB_OHCI_HCD sys_clksrc |= ((4<<12) | (0<<11) | (0<<10)); #endif au_writel(sys_clksrc, SYS_CLKSRC); @@ -95,7 +95,7 @@ void __init board_setup(void) // 2nd USB port is USB host pin_func |= 0x8000; au_writel(pin_func, SYS_PINFUNC); -#endif // defined (CONFIG_USB_OHCI) +#endif // defined (CONFIG_USB_OHCI_HCD) _