Attachment #83439 for bug #127300

Lines 1622-1628 Link Here

(-)orinoco_usb.c.orig (-1 lines)
1622		1622
1623	/* usb specific object needed to register this driver with the usb subsystem */	1623	/* usb specific object needed to register this driver with the usb subsystem */
1624	static struct usb_driver orinoco_driver = {	1624	static struct usb_driver orinoco_driver = {
1625	.owner = THIS_MODULE,
1626	.name = DRIVER_NAME,	1625	.name = DRIVER_NAME,
1627	.probe = ezusb_probe,	1626	.probe = ezusb_probe,
1628	.disconnect = ezusb_disconnect,	1627	.disconnect = ezusb_disconnect,

Lines 461-467 Link Here

(-)prism_usb.c.orig (-1 lines)
461		461
462	/* usb specific object needed to register this driver with the usb subsystem */	462	/* usb specific object needed to register this driver with the usb subsystem */
463	static struct usb_driver prism_usb_driver = {	463	static struct usb_driver prism_usb_driver = {
464	.owner = THIS_MODULE,
465	.name = DRIVER_NAME,	464	.name = DRIVER_NAME,
466	.probe = prism_usb_probe,	465	.probe = prism_usb_probe,
467	.disconnect = prism_usb_disconnect,	466	.disconnect = prism_usb_disconnect,




# Compatibility headers
EXTRA_CFLAGS := -I$(M)

#tmp-m := hermes.o orinoco.o
tmp-m := orinoco.o
tmp-y :=

#tmp-$(CONFIG_PPC_PMAC) += airport.o

#tmp-$(CONFIG_PCI) += orinoco_nortel.o orinoco_pci.o orinoco_plx.o orinoco_tmd.o

#tmp-$(CONFIG_PCMCIA) += orinoco_cs.o

tmp-$(CONFIG_USB) += prism_usb.o

ifdef CONFIG_FW_LOADER
#tmp-$(CONFIG_PCMCIA) += spectrum_cs.o
tmp-$(CONFIG_USB) += orinoco_usb.o
endif


Return to bug 127300

Lines 12-31 Link Here

(-)Kbuild.orig (-5 / +5 lines)
12	# Compatibility headers	12	# Compatibility headers
13	EXTRA_CFLAGS := -I$(M)	13	EXTRA_CFLAGS := -I$(M)
14		14
15	tmp-m := hermes.o orinoco.o	15	#tmp-m := hermes.o orinoco.o
16	tmp-m := orinoco.o	16	tmp-m := orinoco.o
17	tmp-y :=	17	tmp-y :=
18		18
19	tmp-$(CONFIG_PPC_PMAC) += airport.o	19	#tmp-$(CONFIG_PPC_PMAC) += airport.o
20		20
21	tmp-$(CONFIG_PCI) += orinoco_nortel.o orinoco_pci.o orinoco_plx.o orinoco_tmd.o	21	#tmp-$(CONFIG_PCI) += orinoco_nortel.o orinoco_pci.o orinoco_plx.o orinoco_tmd.o
22		22
23	tmp-$(CONFIG_PCMCIA) += orinoco_cs.o	23	#tmp-$(CONFIG_PCMCIA) += orinoco_cs.o
24		24
25	tmp-$(CONFIG_USB) += prism_usb.o	25	tmp-$(CONFIG_USB) += prism_usb.o
26		26
27	ifdef CONFIG_FW_LOADER	27	ifdef CONFIG_FW_LOADER
28	tmp-$(CONFIG_PCMCIA) += spectrum_cs.o	28	#tmp-$(CONFIG_PCMCIA) += spectrum_cs.o
29	tmp-$(CONFIG_USB) += orinoco_usb.o	29	tmp-$(CONFIG_USB) += orinoco_usb.o
30	endif	30	endif
31		31