kbuild: Remove usage of L_TARGET in drivers/*

We use O_TARGET everywhere else, so let's just convert the remaining
users (They get the implicit built-in.o O_TARGET now)

7 files changed, 8 insertions, 39 deletions

diff --git a/Makefile b/Makefile
index 3e6238667ae8..88a3909e9f33 100644
--- a/Makefile
+++ b/Makefile
@@ -124,10 +124,10 @@ DRIVERS-y += drivers/base/base.o \
 	drivers/misc/misc.o \
 	drivers/net/net.o \
 	drivers/media/media.o
-DRIVERS-$(CONFIG_NUBUS) += drivers/nubus/nubus.a
+DRIVERS-$(CONFIG_NUBUS) += drivers/nubus/built-in.o
 DRIVERS-$(CONFIG_ATM) += drivers/atm/atm.o
 DRIVERS-$(CONFIG_IDE) += drivers/ide/idedriver.o
-DRIVERS-$(CONFIG_FC4) += drivers/fc4/fc4.a
+DRIVERS-$(CONFIG_FC4) += drivers/fc4/built-in.o
 DRIVERS-$(CONFIG_SCSI) += drivers/scsi/scsidrv.o
 DRIVERS-$(CONFIG_FUSION) += drivers/message/message.o
 DRIVERS-$(CONFIG_IEEE1394) += drivers/ieee1394/ieee1394drv.o
@@ -139,16 +139,16 @@ endif
 DRIVERS-$(CONFIG_SOUND) += sound/sound.o
 DRIVERS-$(CONFIG_MTD) += drivers/mtd/mtdlink.o
 DRIVERS-$(CONFIG_PCMCIA) += drivers/pcmcia/pcmcia.o
-DRIVERS-$(CONFIG_DIO) += drivers/dio/dio.a
+DRIVERS-$(CONFIG_DIO) += drivers/dio/built-in.o
 DRIVERS-$(CONFIG_SBUS) += drivers/sbus/sbus_all.o
 DRIVERS-$(CONFIG_ZORRO) += drivers/zorro/driver.o
 DRIVERS-$(CONFIG_ALL_PPC) += drivers/macintosh/macintosh.o
 DRIVERS-$(CONFIG_MAC) += drivers/macintosh/macintosh.o
 DRIVERS-$(CONFIG_PNP) += drivers/pnp/pnp.o
-DRIVERS-$(CONFIG_SGI_IP22) += drivers/sgi/sgi.a
+DRIVERS-$(CONFIG_SGI_IP22) += drivers/sgi/built-in.o
 DRIVERS-$(CONFIG_VT) += drivers/video/video.o
-DRIVERS-$(CONFIG_PARIDE) += drivers/block/paride/paride.a
-DRIVERS-$(CONFIG_TC) += drivers/tc/tc.a
+DRIVERS-$(CONFIG_PARIDE) += drivers/block/paride/built-in.o
+DRIVERS-$(CONFIG_TC) += drivers/tc/built-in.o
 DRIVERS-$(CONFIG_USB) += drivers/usb/usbdrv.o
 DRIVERS-$(CONFIG_INPUT) += drivers/input/inputdrv.o
 DRIVERS-$(CONFIG_GAMEPORT) += drivers/input/gameport/gamedrv.o
diff --git a/drivers/block/paride/Makefile b/drivers/block/paride/Makefile
index dc49e4113d41..d62c39cb9b55 100644
--- a/drivers/block/paride/Makefile
+++ b/drivers/block/paride/Makefile
@@ -5,8 +5,6 @@
 # Rewritten to use lists instead of if-statements.
 #
 
-L_TARGET := paride.a
-
 export-objs := paride.o bpck6.o
 
 obj-$(CONFIG_PARIDE)		+= paride.o
diff --git a/drivers/dio/Makefile b/drivers/dio/Makefile
index 48d3522a7875..522b2e25ba8c 100644
--- a/drivers/dio/Makefile
+++ b/drivers/dio/Makefile
@@ -1,19 +1,7 @@
 #
 # Makefile for the linux kernel.
 #
-# Note! Dependencies are done automagically by 'make dep', which also
-# removes any old dependencies. DON'T put your own dependencies here
-# unless it's something special (ie not a .c file).
-#
-# Note 2! The CFLAGS definitions are now in the main makefile...
-#
-# NB: cribbed from the drivers/sbus/Makefile -- PMM
-
-SUB_DIRS     :=
-MOD_SUB_DIRS := $(SUB_DIRS)
-ALL_SUB_DIRS := $(SUB_DIRS)
 
-L_OBJS   := dio.o
-L_TARGET := dio.a
+obj-y := dio.o
 
 include $(TOPDIR)/Rules.make
diff --git a/drivers/fc4/Makefile b/drivers/fc4/Makefile
index 6fc3c1f58004..37b66772421c 100644
--- a/drivers/fc4/Makefile
+++ b/drivers/fc4/Makefile
@@ -2,8 +2,6 @@
 # Makefile for the Linux Fibre Channel device drivers.
 #
 
-L_TARGET := fc4.a
-
 export-objs := fc_syms.o
 
 fc4-objs := fc.o fc_syms.o
diff --git a/drivers/nubus/Makefile b/drivers/nubus/Makefile
index 4df102258028..2a41129a0c40 100644
--- a/drivers/nubus/Makefile
+++ b/drivers/nubus/Makefile
@@ -1,15 +1,6 @@
 #
 # Makefile for the nubus specific drivers.
 #
-# Note! Dependencies are done automagically by 'make dep', which also
-# removes any old dependencies. DON'T put your own dependencies here
-# unless it's something special (ie not a .c file).
-#
-# Note 2! The CFLAGS definition is now inherited from the
-# parent makefile.
-#
-
-L_TARGET := nubus.a
 
 export-objs := nubus_syms.o
 
diff --git a/drivers/sgi/Makefile b/drivers/sgi/Makefile
index 2b42fcd453a8..f5cc50a63c37 100644
--- a/drivers/sgi/Makefile
+++ b/drivers/sgi/Makefile
@@ -1,13 +1,6 @@
 #
 # Makefile for the linux kernel.
 #
-# Note! Dependencies are done automagically by 'make dep', which also
-# removes any old dependencies. DON'T put your own dependencies here
-# unless it's something special (ie not a .c file).
-#
-# Note 2! The CFLAGS definitions are now in the main makefile...
-
-L_TARGET := sgi.a
 
 #
 # Character and Audio devices for SGI machines.
diff --git a/include/linux/usb.h b/include/linux/usb.h
index cd0067056e38..498a1c7fae67 100644
--- a/include/linux/usb.h
+++ b/include/linux/usb.h
@@ -99,6 +99,7 @@
 #ifdef __KERNEL__
 
 #include <linux/config.h>
+#include <linux/errno.h>
 #include <linux/delay.h>	/* for mdelay() */
 #include <linux/interrupt.h>	/* for in_interrupt() */
 #include <linux/list.h>		/* for struct list_head */