From: Andrew Morton Fix ghastly linkage tangle: drivers/usb/built-in.o(.data+0xd60): In function `usb_get_current_frame_number': /usr/src/25/drivers/usb/core/usb.c:1101: multiple definition of `usb_early_handoff' drivers/usb/host/built-in.o(.data+0x0):/usr/src/25/drivers/usb/host/ehci-hcd.c:1274: first defined here ld -m elf_i386 -r -o drivers/built-in.o drivers/pci/built-in.o drivers/usb/host/built-in.o drivers/video/built-in.o drivers/acpi/built-in.o drivers/pnp/built-in.o drivers/char/built-in.o drivers/video/i810/built-in.o drivers/video/intelfb/built-in.o drivers/input/serio/built-in.o drivers/serial/built-in.o drivers/input/built-in.o drivers/base/built-in.o drivers/block/built-in.o drivers/misc/built-in.o drivers/mfd/built-in.o drivers/net/built-in.o drivers/media/built-in.o drivers/ide/built-in.o drivers/scsi/built-in.o drivers/cdrom/built-in.o drivers/usb/built-in.o drivers/input/gameport/built-in.o drivers/message/built-in.o drivers/i2c/built-in.o drivers/hwmon/built-in.o drivers/md/built-in.o drivers/eisa/built-in.o drivers/firmware/built-in.o drivers/crypto/built-in.o We're linking drivers/usb/host/built-in.o with drivers/usb/built-in.o The change to drivers/Makefile was of course unchangelogged, so NFI what this fix will break. Please don't do that. Cc: David Brownell Cc: Greg KH Signed-off-by: Andrew Morton --- drivers/Makefile | 2 +- 1 files changed, 1 insertion(+), 1 deletion(-) diff -puN drivers/Makefile~gregkh-usb-usb-handoff-merge-usb-Makefile-fix drivers/Makefile --- devel/drivers/Makefile~gregkh-usb-usb-handoff-merge-usb-Makefile-fix 2005-09-21 00:53:18.000000000 -0700 +++ devel-akpm/drivers/Makefile 2005-09-21 00:53:18.000000000 -0700 @@ -4,7 +4,7 @@ # Rewritten to use lists instead of if-statements. # -obj-$(CONFIG_PCI) += pci/ usb/host/ +obj-$(CONFIG_PCI) += pci/ obj-$(CONFIG_PARISC) += parisc/ obj-y += video/ obj-$(CONFIG_ACPI) += acpi/ _