Rename O_TARGET to <subdir>.o in drivers/usb.

drivers/usb/Makefile

@@ -9,7 +9,7 @@ mod-subdirs	:= core host class media net serial storage image misc input
 
 subdir-$(CONFIG_USB)		+= core
 ifeq ($(CONFIG_USB),y)
-	obj-y += core/usb-core.o
+	obj-y += core/core.o
 endif
 
 subdir-$(CONFIG_USB_EHCI_HCD)	+= host
@@ -18,7 +18,7 @@ subdir-$(CONFIG_USB_OHCI)	+= host
 subdir-$(CONFIG_USB_UHCI_ALT)	+= host
 subdir-$(CONFIG_USB_UHCI)	+= host
 ifeq ($(CONFIG_USB_HOST),y)
-	obj-y += host/usb-host.o
+	obj-y += host/host.o
 endif
 
 subdir-$(CONFIG_USB_ACM)	+= class
@@ -26,7 +26,7 @@ subdir-$(CONFIG_USB_AUDIO)	+= class
 subdir-$(CONFIG_USB_BLUETOOTH)	+= class
 subdir-$(CONFIG_USB_PRINTER)	+= class
 ifeq ($(CONFIG_USB_CLASS),y)
-	obj-y += class/usb-class.o
+	obj-y += class/class.o
 endif
 
 subdir-$(CONFIG_USB_STORAGE)	+= storage
@@ -39,7 +39,7 @@ subdir-$(CONFIG_USB_KBD)	+= input
 subdir-$(CONFIG_USB_MOUSE)	+= input
 subdir-$(CONFIG_USB_WACOM)	+= input
 ifeq ($(CONFIG_USB_INPUT),y)
-	obj-y += input/usb-input.o
+	obj-y += input/input.o
 endif
 
 subdir-$(CONFIG_USB_DABUSB)	+= media
@@ -52,7 +52,7 @@ subdir-$(CONFIG_USB_SE401)	+= media
 subdir-$(CONFIG_USB_STV680)	+= media
 subdir-$(CONFIG_USB_VICAM)	+= media
 ifeq ($(CONFIG_USB_MEDIA),y)
-	obj-y += media/usb-media.o
+	obj-y += media/media.o
 endif
 
 subdir-$(CONFIG_USB_CATC)	+= net
@@ -62,7 +62,7 @@ subdir-$(CONFIG_USB_PEGASUS)	+= net
 subdir-$(CONFIG_USB_RTL8150)	+= net
 subdir-$(CONFIG_USB_USBNET)	+= net
 ifeq ($(CONFIG_USB_NET),y)
-	obj-y += net/usb-net.o
+	obj-y += net/net.o
 endif
 
 subdir-$(CONFIG_USB_DC2XX)	+= image
@@ -71,12 +71,12 @@ subdir-$(CONFIG_USB_MDC800)	+= image
 subdir-$(CONFIG_USB_MICROTEK)	+= image
 subdir-$(CONFIG_USB_SCANNER)	+= image
 ifeq ($(CONFIG_USB_IMAGE),y)
-	obj-y += image/usb-image.o
+	obj-y += image/image.o
 endif
 
 subdir-$(CONFIG_USB_SERIAL)	+= serial
 ifeq ($(CONFIG_USB_SERIAL),y)
-	obj-y += serial/usb-serial.o
+	obj-y += serial/serial.o
 endif
 
 subdir-$(CONFIG_USB_AUERSWALD)	+= misc
@@ -85,7 +85,7 @@ subdir-$(CONFIG_USB_RIO500)	+= misc
 subdir-$(CONFIG_USB_TIGL)	+= misc
 subdir-$(CONFIG_USB_USS720)	+= misc
 ifeq ($(CONFIG_USB_MISC),y)
-	obj-y += misc/usb-misc.o
+	obj-y += misc/misc.o
 endif
 
 include $(TOPDIR)/Rules.make

drivers/usb/class/Makefile

@@ -3,7 +3,7 @@
 # (one step up from the misc category)
 #
 
-O_TARGET	:= usb-class.o
+O_TARGET	:= class.o
 
 obj-$(CONFIG_USB_ACM)		+= cdc-acm.o
 obj-$(CONFIG_USB_AUDIO)		+= audio.o

drivers/usb/core/Makefile

@@ -2,7 +2,7 @@
 # Makefile for USB Core files and filesystem
 #
 
-O_TARGET	:= usb-core.o
+O_TARGET	:= core.o
 
 export-objs	:= usb.o hcd.o
 

drivers/usb/host/Makefile

@@ -3,7 +3,7 @@
 # framework and drivers
 #
 
-O_TARGET	:= usb-host.o
+O_TARGET	:= host.o
 
 obj-$(CONFIG_USB_EHCI_HCD)	+= ehci-hcd.o
 obj-$(CONFIG_USB_OHCI_HCD)	+= ohci-hcd.o

drivers/usb/image/Makefile

@@ -2,7 +2,7 @@
 # Makefile for USB Image drivers
 #
 
-O_TARGET	:= usb-image.o
+O_TARGET	:= image.o
 
 obj-$(CONFIG_USB_MDC800)	+= mdc800.o
 obj-$(CONFIG_USB_HPUSBSCSI)	+= hpusbscsi.o

drivers/usb/input/Makefile

@@ -2,7 +2,7 @@
 # Makefile for the USB input drivers
 #
 
-O_TARGET	:= usb-input.o
+O_TARGET	:= input.o
 
 # Multipart objects.
 hid-objs	:= hid-core.o

drivers/usb/media/Makefile

@@ -2,7 +2,7 @@
 # Makefile for USB Media drivers
 #
 
-O_TARGET	:= usb-media.o
+O_TARGET	:= media.o
 
 export-objs	:= ov511.o pwc-uncompress.o
 

drivers/usb/misc/Makefile

@@ -3,7 +3,7 @@
 # (the ones that don't fit into any other categories)
 #
 
-O_TARGET	:= usb-misc.o
+O_TARGET	:= misc.o
 
 obj-$(CONFIG_USB_AUERSWALD)	+= auerswald.o
 obj-$(CONFIG_USB_EMI26)		+= emi26.o

drivers/usb/net/Makefile

@@ -2,7 +2,7 @@
 # Makefile for USB Network drivers
 #
 
-O_TARGET	:= usb-net.o
+O_TARGET	:= net.o
 
 obj-$(CONFIG_USB_CATC)		+= catc.o
 obj-$(CONFIG_USB_CDCETHER)	+= cdc-ether.o

drivers/usb/serial/Makefile

@@ -2,7 +2,7 @@
 # Makefile for the USB serial device drivers.
 #
 
-O_TARGET	:= usb-serial.o
+O_TARGET	:= serial.o
 
 # Object file lists.