patch-2.4.21 linux-2.4.21/drivers/usb/Makefile
Next file: linux-2.4.21/drivers/usb/acm.c
Previous file: linux-2.4.21/drivers/usb/Config.in
Back to the patch index
Back to the overall index
- Lines: 97
- Date:
2003-06-13 07:51:36.000000000 -0700
- Orig file:
linux-2.4.20/drivers/usb/Makefile
- Orig date:
2002-11-28 15:53:14.000000000 -0800
diff -urN linux-2.4.20/drivers/usb/Makefile linux-2.4.21/drivers/usb/Makefile
@@ -18,7 +18,7 @@
usbcore-objs := usb.o usb-debug.o hub.o
hid-objs := hid-core.o
pwc-objs := pwc-if.o pwc-misc.o pwc-ctrl.o pwc-uncompress.o
-
+auerswald-objs := auerbuf.o auerchain.o auerchar.o auermain.o
# Optional parts of multipart objects.
@@ -34,6 +34,12 @@
hid-objs += hid-input.o
endif
+ifdef CONFIG_USB_AUERISDN
+ifneq ($(CONFIG_USB_AUERISDN),n)
+ auerswald-objs += auerisdn.o auerisdn_b.o
+endif
+endif
+
# Object file lists.
obj-y :=
@@ -47,23 +53,37 @@
# EHCI should initialize/link before the other HCDs
ifeq ($(CONFIG_USB_EHCI_HCD),y)
- obj-y += hcd/ehci-hcd.o
+ obj-y += host/ehci-hcd.o
endif
-obj-$(CONFIG_USB_UHCI) += usb-uhci.o
-obj-$(CONFIG_USB_UHCI_ALT) += uhci.o
-obj-$(CONFIG_USB_OHCI) += usb-ohci.o
-
ifneq ($(CONFIG_USB_EHCI_HCD),n)
usbcore-objs += hcd.o
endif
-subdir-$(CONFIG_USB_EHCI_HCD) += hcd
+
+subdir-$(CONFIG_USB_EHCI_HCD) += host
+
+subdir-$(CONFIG_USB_UHCI_ALT) += host
+ifeq ($(CONFIG_USB_UHCI_ALT),y)
+ obj-y += host/uhci.o
+endif
+
+subdir-$(CONFIG_USB_UHCI) += host
+ifeq ($(CONFIG_USB_UHCI),y)
+ obj-y += host/usb-uhci.o
+endif
+
+subdir-$(CONFIG_USB_OHCI) += host
+ifeq ($(CONFIG_USB_OHCI),y)
+ obj-y += host/usb-ohci.o
+endif
obj-$(CONFIG_USB_MOUSE) += usbmouse.o
obj-$(CONFIG_USB_HID) += hid.o
obj-$(CONFIG_USB_KBD) += usbkbd.o
obj-$(CONFIG_USB_AIPTEK) += aiptek.o
obj-$(CONFIG_USB_WACOM) += wacom.o
+obj-$(CONFIG_USB_KBTAB) += kbtab.o
+obj-$(CONFIG_USB_POWERMATE) += powermate.o
obj-$(CONFIG_USB_SCANNER) += scanner.o
obj-$(CONFIG_USB_ACM) += acm.o
@@ -72,12 +92,13 @@
obj-$(CONFIG_USB_EMI26) += emi26.o
obj-$(CONFIG_USB_MIDI) += usb-midi.o
obj-$(CONFIG_USB_IBMCAM) += ibmcam.o usbvideo.o ultracam.o
+obj-$(CONFIG_USB_KONICAWC) += konicawc.o usbvideo.o
obj-$(CONFIG_USB_PWC) += pwc.o
obj-$(CONFIG_USB_DC2XX) += dc2xx.o
obj-$(CONFIG_USB_MDC800) += mdc800.o
obj-$(CONFIG_USB_USS720) += uss720.o
obj-$(CONFIG_USB_DABUSB) += dabusb.o
-obj-$(CONFIG_USB_VICAM) += vicam.o
+obj-$(CONFIG_USB_VICAM) += vicam.o usbvideo.o
obj-$(CONFIG_USB_OV511) += ov511.o
obj-$(CONFIG_USB_SE401) += se401.o
obj-$(CONFIG_USB_STV680) += stv680.o
@@ -98,7 +119,7 @@
obj-$(CONFIG_USB_LCD) += usblcd.o
# Object files in subdirectories
-mod-subdirs := serial hcd
+mod-subdirs := serial host
subdir-$(CONFIG_USB_SERIAL) += serial
subdir-$(CONFIG_USB_STORAGE) += storage
@@ -123,3 +144,6 @@
pwc.o: $(pwc-objs)
$(LD) -r -o $@ $(pwc-objs)
+
+auerswald.o: $(auerswald-objs)
+ $(LD) -r -o $@ $(auerswald-objs)
FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)