From aa923ef1aa39473b7d1f413c73a3e1d19ebde65d Mon Sep 17 00:00:00 2001 From: Michal Sojka Date: Wed, 24 Sep 2014 22:43:20 +0200 Subject: [PATCH] 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 Acked-by: Felipe Balbi Tested-by: Felipe Balbi Signed-off-by: Greg Kroah-Hartman --- drivers/usb/common/Makefile | 4 +++- drivers/usb/common/{usb-common.c => common.c} | 0 2 files changed, 3 insertions(+), 1 deletion(-) rename drivers/usb/common/{usb-common.c => common.c} (100%) 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 similarity index 100% rename from drivers/usb/common/usb-common.c rename to drivers/usb/common/common.c -- 2.20.1