summaryrefslogtreecommitdiffstats
path: root/drivers/usb/common
diff options
context:
space:
mode:
authorMichal Sojka <sojka@merica.cz>2014-09-24 22:43:20 +0200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2014-09-25 17:02:34 +0200
commitaa923ef1aa39473b7d1f413c73a3e1d19ebde65d (patch)
treee03d639690a0692d3461b32c057b2e746d9e3d76 /drivers/usb/common
parent304f7e5e1d08fa2f5674c1323bd0ebd806c86b81 (diff)
downloadlinux-aa923ef1aa39473b7d1f413c73a3e1d19ebde65d.tar.bz2
usb: Rename usb-common.c
In the next commit, we will want the usb-common module to be composed of two object files. Since Kbuild cannot "append" another object to an existing one, we need to rename usb-common.c to something else (common.c) and create usb-common.o by linking the wanted objects together. Currently, usb-common.o comprises only common.o. Signed-off-by: Michal Sojka <sojka@merica.cz> Acked-by: Felipe Balbi <balbi@ti.com> Tested-by: Felipe Balbi <balbi@ti.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/usb/common')
-rw-r--r--drivers/usb/common/Makefile4
-rw-r--r--drivers/usb/common/common.c (renamed from drivers/usb/common/usb-common.c)0
2 files changed, 3 insertions, 1 deletions
diff --git a/drivers/usb/common/Makefile b/drivers/usb/common/Makefile
index 752646167e1e..052c12069c24 100644
--- a/drivers/usb/common/Makefile
+++ b/drivers/usb/common/Makefile
@@ -2,5 +2,7 @@
# Makefile for the usb common parts.
#
-obj-$(CONFIG_USB_COMMON) += usb-common.o
+obj-$(CONFIG_USB_COMMON) += usb-common.o
+usb-common-y += common.o
+
obj-$(CONFIG_USB_OTG_FSM) += usb-otg-fsm.o
diff --git a/drivers/usb/common/usb-common.c b/drivers/usb/common/common.c
index b530fd403ffb..b530fd403ffb 100644
--- a/drivers/usb/common/usb-common.c
+++ b/drivers/usb/common/common.c