[patch] 2.5.70-mm3: usb_gadget_* several times defined

[Adrian Bunk <bunk@fs.tum.de>]

It seems the following compile error comes from Linus' tree:

<--  snip  -->

...
  LD      drivers/built-in.o
drivers/usb/gadget/built-in.o(.text+0x2d00): In function 
`net2280_set_fifo_mode':
: multiple definition of `net2280_set_fifo_mode'
drivers/usb/built-in.o(.text+0xb9460): first defined here
drivers/usb/gadget/built-in.o(.text+0x6040): In function 
`usb_gadget_get_string':
: multiple definition of `usb_gadget_get_string'
drivers/usb/built-in.o(.text+0xbc7a0): first defined here
drivers/usb/gadget/built-in.o(.text+0x32c0): In function 
`usb_gadget_register_driver':
: multiple definition of `usb_gadget_register_driver'
drivers/usb/built-in.o(.text+0xb9a20): first defined here
drivers/usb/gadget/built-in.o(.text+0x3620): In function 
`usb_gadget_unregister_driver':
: multiple definition of `usb_gadget_unregister_driver'
drivers/usb/built-in.o(.text+0xb9d80): first defined here
make[1]: *** [drivers/built-in.o] Error 1

<--  snip  -->


The following patch fixes it (drivers/usb/Makefile now includes gadget/
entries):


--- linux-2.5.70-mm3/drivers/Makefile.old	2003-05-31 23:00:25.000000000 +0200
+++ linux-2.5.70-mm3/drivers/Makefile	2003-05-31 23:00:44.000000000 +0200
@@ -37,7 +37,6 @@
 obj-$(CONFIG_PARIDE) 		+= block/paride/
 obj-$(CONFIG_TC)		+= tc/
 obj-$(CONFIG_USB)		+= usb/
-obj-$(CONFIG_USB_GADGET)	+= usb/gadget/
 obj-$(CONFIG_INPUT)		+= input/
 obj-$(CONFIG_GAMEPORT)		+= input/gameport/
 obj-$(CONFIG_SERIO)		+= input/serio/



cu
Adrian

-- 

       "Is there not promise of rain?" Ling Tan asked suddenly out
        of the darkness. There had been need of rain for many days.
       "Only a promise," Lao Er said.
                                       Pearl S. Buck - Dragon Seed