USB Config.in and Makefile fixups

fixed up the Config.in and Makefile merge due to there being 2 uhci-hcd drivers added at once.

diff --git a/drivers/usb/host/Config.in b/drivers/usb/host/Config.in
index df1bb64d58af5664a083025e7b0246599f814ad7..e41633a7cafc584f25e4ec69b9cda513a57f0152 100644 (file)
--- a/drivers/usb/host/Config.in
+++ b/drivers/usb/host/Config.in
@@ -4,7 +4,8 @@
 comment 'USB Host Controller Drivers'
 dep_tristate '  EHCI HCD (USB 2.0) support (EXPERIMENTAL)' CONFIG_USB_EHCI_HCD $CONFIG_USB $CONFIG_EXPERIMENTAL
 dep_tristate '  OHCI HCD support (EXPERIMENTAL)' CONFIG_USB_OHCI_HCD $CONFIG_USB $CONFIG_EXPERIMENTAL
- dep_tristate '  UHCI HCD (most Intel and VIA) support (EXPERIMENTAL)' CONFIG_USB_UHCI_HCD $CONFIG_USB $CONFIG_EXPERIMENTAL
+dep_tristate '  UHCI HCD (most Intel and VIA) support (EXPERIMENTAL)' CONFIG_USB_UHCI_HCD $CONFIG_USB $CONFIG_EXPERIMENTAL
+dep_tristate '  UHCI HCD Alternate (most Intel and VIA) support (EXPERIMENTAL)' CONFIG_USB_UHCI_HCD_ALT $CONFIG_USB $CONFIG_EXPERIMENTAL
 if [ "$CONFIG_USB_UHCI_ALT" != "y" ]; then
    dep_tristate '  UHCI (Intel PIIX4, VIA, ...) support' CONFIG_USB_UHCI $CONFIG_USB
 fi

diff --git a/drivers/usb/host/Makefile b/drivers/usb/host/Makefile
index dcab55e8fc6a646f35bbabd44c07d6bc3fbaaa07..14bb932676fd375d5fa586e4561de0940848ae89 100644 (file)
--- a/drivers/usb/host/Makefile
+++ b/drivers/usb/host/Makefile
@@ -7,7 +7,8 @@ O_TARGET        := host.o
 
 obj-$(CONFIG_USB_EHCI_HCD)     += ehci-hcd.o
 obj-$(CONFIG_USB_OHCI_HCD)     += ohci-hcd.o
-obj-$(CONFIG_USB_UHCI_HCD)     += uhci-hcd.o
+obj-$(CONFIG_USB_UHCI_HCD)     += usb-uhci-hcd.o
+obj-$(CONFIG_USB_UHCI_HCD_ALT) += uhci-hcd.o
 
 obj-$(CONFIG_USB_UHCI)         += usb-uhci.o
 obj-$(CONFIG_USB_UHCI_ALT)     += uhci.o