Update of /cvsroot/linuxconsole/ruby/linux/drivers/usb
In directory usw-pr-cvs1:/tmp/cvs-serv25719
Modified Files:
Makefile
Log Message:
"Updated" by copying the Makefile from 2.5.5-dj1. Do we need this Makefile in linuxconsole at all ?
Index: Makefile
===================================================================
RCS file: /cvsroot/linuxconsole/ruby/linux/drivers/usb/Makefile,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- Makefile 15 Oct 2001 01:13:17 -0000 1.15
+++ Makefile 3 Mar 2002 16:28:06 -0000 1.16
@@ -10,18 +10,13 @@
# Objects that export symbols.
-export-objs := usb.o
+export-objs := usb.o hcd.o ov511.o pwc-uncompress.o
# Multipart objects.
-list-multi := usbcore.o
-usbcore-objs := usb.o usb-debug.o hub.o
-
-ifneq ($(CONFIG_USB_PWC),n)
- export-objs += pwc-uncompress.o
- list-multi += pwc.o
-endif
-
+list-multi := usbcore.o hid.o pwc.o
+usbcore-objs := usb.o usb-debug.o hub.o hcd.o
+hid-objs := hid-core.o hid-input.o
pwc-objs := pwc-if.o pwc-misc.o pwc-ctrl.o pwc-uncompress.o
@@ -31,6 +26,14 @@
usbcore-objs += devio.o inode.o drivers.o devices.o
endif
+ifeq ($(CONFIG_USB_HIDDEV),y)
+ hid-objs += hiddev.o
+endif
+
+ifeq ($(CONFIG_LOGITECH_RUMBLE),y)
+ hid-objs += hid-ff.o
+endif
+
# Object file lists.
obj-y :=
@@ -41,22 +44,41 @@
# Each configuration option enables a list of files.
obj-$(CONFIG_USB) += usbcore.o
+
+# EHCI needs to be linked before the other HCD drivers
+ifeq ($(CONFIG_USB_EHCI_HCD),y)
+ obj-y += hcd/ehci-hcd.o
+endif
+
+ifeq ($(CONFIG_USB_OHCI_HCD),y)
+ obj-y += hcd/ohci-hcd.o
+endif
+
obj-$(CONFIG_USB_UHCI) += usb-uhci.o
obj-$(CONFIG_USB_UHCI_ALT) += uhci.o
obj-$(CONFIG_USB_OHCI) += usb-ohci.o
+obj-$(CONFIG_USB_MOUSE) += usbmouse.o
+obj-$(CONFIG_USB_HID) += hid.o
+obj-$(CONFIG_USB_KBD) += usbkbd.o
+obj-$(CONFIG_USB_WACOM) += wacom.o
+obj-$(CONFIG_USB_POWERMATE) += powermate.o
+
obj-$(CONFIG_USB_SCANNER) += scanner.o
obj-$(CONFIG_USB_ACM) += acm.o
obj-$(CONFIG_USB_PRINTER) += printer.o
obj-$(CONFIG_USB_AUDIO) += audio.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_OV511) += ov511.o
obj-$(CONFIG_USB_SE401) += se401.o
+obj-$(CONFIG_USB_STV680) += stv680.o
obj-$(CONFIG_USB_PEGASUS) += pegasus.o
obj-$(CONFIG_USB_CATC) += catc.o
obj-$(CONFIG_USB_KAWETH) += kaweth.o
@@ -67,9 +89,13 @@
obj-$(CONFIG_USB_HPUSBSCSI) += hpusbscsi.o
obj-$(CONFIG_USB_BLUETOOTH) += bluetooth.o
obj-$(CONFIG_USB_USBNET) += usbnet.o
+obj-$(CONFIG_USB_AUERSWALD) += auerswald.o
# Object files in subdirectories
+mod-subdirs := serial hcd
+subdir-$(CONFIG_USB_EHCI_HCD) += hcd
+subdir-$(CONFIG_USB_OHCI_HCD) += hcd
subdir-$(CONFIG_USB_SERIAL) += serial
subdir-$(CONFIG_USB_STORAGE) += storage
@@ -87,6 +113,9 @@
usbcore.o: $(usbcore-objs)
$(LD) -r -o $@ $(usbcore-objs)
+
+hid.o: $(hid-objs)
+ $(LD) -r -o $@ $(hid-objs)
pwc.o: $(pwc-objs)
$(LD) -r -o $@ $(pwc-objs)
|
