summaryrefslogtreecommitdiff
path: root/drivers/usb/Makefile
diff options
context:
space:
mode:
authorFelipe Balbi <balbi@ti.com>2013-03-06 16:00:45 +0200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-03-07 12:29:09 +0800
commit1c2088812f095df77f4b3224b65db79d7111a300 (patch)
treeace1595f86b88a05adae111b30c6a74c4ce6a5db /drivers/usb/Makefile
parent1941138e1c024ecb5bd797d414928d3eb94d8662 (diff)
usb: Makefile: fix drivers/usb/phy/ Makefile entry
drivers/usb/phy/ should be compiled everytime we have CONFIG_USB_OTG_UTILS enabled. phy/ should've been part of the build process based on CONFIG_USB_OTG_UTILS, don't know where I had my head when I allowed CONFIG_USB_COMMON there. In fact commit c6156328dec52a55f90688cbfad21c83f8711d84 tried to fix a previous issue but it made things even worse. The real solution is to compile phy/ based on CONFIG_USB_OTG_UTILS which gets selected by all PHY drivers. I only triggered the error recently after accepting a patch which moved a bunch of code from otg/otg.c to phy/phy.c and running 100 randconfig cycles. Signed-off-by: Felipe Balbi <balbi@ti.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/usb/Makefile')
-rw-r--r--drivers/usb/Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/usb/Makefile b/drivers/usb/Makefile
index f5ed3d75fa5a..8f5ebced5df0 100644
--- a/drivers/usb/Makefile
+++ b/drivers/usb/Makefile
@@ -46,7 +46,7 @@ obj-$(CONFIG_USB_MICROTEK) += image/
obj-$(CONFIG_USB_SERIAL) += serial/
obj-$(CONFIG_USB) += misc/
-obj-$(CONFIG_USB_COMMON) += phy/
+obj-$(CONFIG_USB_OTG_UTILS) += phy/
obj-$(CONFIG_EARLY_PRINTK_DBGP) += early/
obj-$(CONFIG_USB_ATM) += atm/