Skip to content

L
linux
Commit dff4eb9d authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files
Options

USB 

moved class/storage/ back to storage/
created input/
orderd the makefiles and config.in menus better.
parent 03943afd
Hide whitespace changes
Inline Side-by-side
Showing with 142 additions and 120 deletions
drivers/usb/Config.in
View file @ dff4eb9d
...@@ -12,7 +12,9 @@ if [ "$CONFIG_USB" = "y" -o "$CONFIG_USB" = "m" ]; then ...@@ -12,7 +12,9 @@ if [ "$CONFIG_USB" = "y" -o "$CONFIG_USB" = "m" ]; then
source drivers/usb/class/Config.in source drivers/usb/class/Config.in
dep_tristate ' Wacom Intuos/Graphire tablet support' CONFIG_USB_WACOM $CONFIG_USB $CONFIG_INPUT source drivers/usb/storage/Config.in
source drivers/usb/input/Config.in
source drivers/usb/image/Config.in source drivers/usb/image/Config.in
...@@ -22,24 +24,21 @@ if [ "$CONFIG_USB" = "y" -o "$CONFIG_USB" = "m" ]; then ...@@ -22,24 +24,21 @@ if [ "$CONFIG_USB" = "y" -o "$CONFIG_USB" = "m" ]; then
comment 'USB port drivers' comment 'USB port drivers'
dep_tristate ' USS720 parport driver' CONFIG_USB_USS720 $CONFIG_USB $CONFIG_PARPORT dep_tristate ' USS720 parport driver' CONFIG_USB_USS720 $CONFIG_USB $CONFIG_PARPORT
source drivers/usb/serial/Config.in source drivers/usb/serial/Config.in
comment 'USB Miscellaneous drivers' comment 'USB Miscellaneous drivers'
dep_tristate ' EMI 2|6 USB Audio interface support' CONFIG_USB_EMI26 $CONFIG_USB_AUDIO dep_tristate ' EMI 2|6 USB Audio interface support' CONFIG_USB_EMI26 $CONFIG_USB_AUDIO
dep_tristate ' USB Diamond Rio500 support (EXPERIMENTAL)' CONFIG_USB_RIO500 $CONFIG_USB $CONFIG_EXPERIMENTAL
dep_tristate ' USB Auerswald ISDN support (EXPERIMENTAL)' CONFIG_USB_AUERSWALD $CONFIG_USB $CONFIG_EXPERIMENTAL
dep_tristate ' Texas Instruments Graph Link USB (aka SilverLink) cable support' CONFIG_USB_TIGL $CONFIG_USB dep_tristate ' Texas Instruments Graph Link USB (aka SilverLink) cable support' CONFIG_USB_TIGL $CONFIG_USB
dep_tristate ' DABUSB driver' CONFIG_USB_DABUSB $CONFIG_USB dep_tristate ' USB Auerswald ISDN support (EXPERIMENTAL)' CONFIG_USB_AUERSWALD $CONFIG_USB $CONFIG_EXPERIMENTAL
dep_tristate ' USB Diamond Rio500 support (EXPERIMENTAL)' CONFIG_USB_RIO500 $CONFIG_USB $CONFIG_EXPERIMENTAL
# Turn on CONFIG_USB_MISC if any of the drivers are compiled into the kernel # Turn on CONFIG_USB_MISC if any of the drivers are compiled into the kernel
# to make our Makefile logic a bit simpler # to make our Makefile logic a bit simpler
if [ "$CONFIG_USB_USS720" = "y" -o "$CONFIG_USB_EMI26" = "y" -o "$CONFIG_USB_RIO500" = "y" ]; then if [ "$CONFIG_USB_USS720" = "y" -o "$CONFIG_USB_EMI26" = "y" -o "$CONFIG_USB_RIO500" = "y" ]; then
define_bool CONFIG_USB_MISC y define_bool CONFIG_USB_MISC y
fi fi
if [ "$CONFIG_USB_AUERSWALD" = "y" -o "$CONFIG_USB_TIGL" = "y" -o "$CONFIG_USB_DABUSB" = "y" ]; then if [ "$CONFIG_USB_AUERSWALD" = "y" -o "$CONFIG_USB_TIGL" = "y" ]; then
define_bool CONFIG_USB_MISC y
fi
if [ "$CONFIG_USB_WACOM" = "y" ]; then
define_bool CONFIG_USB_MISC y define_bool CONFIG_USB_MISC y
fi fi
......
drivers/usb/Makefile
View file @ dff4eb9d
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
O_TARGET := usbdrv.o O_TARGET := usbdrv.o
# Object files in subdirectories # Object files in subdirectories
mod-subdirs := core host class media net serial image misc mod-subdirs := core host class media net serial storage image misc input
subdir-$(CONFIG_USB) += core subdir-$(CONFIG_USB) += core
ifeq ($(CONFIG_USB),y) ifeq ($(CONFIG_USB),y)
...@@ -14,9 +14,9 @@ endif ...@@ -14,9 +14,9 @@ endif
subdir-$(CONFIG_USB_EHCI_HCD) += host subdir-$(CONFIG_USB_EHCI_HCD) += host
subdir-$(CONFIG_USB_OHCI_HCD) += host subdir-$(CONFIG_USB_OHCI_HCD) += host
subdir-$(CONFIG_USB_UHCI) += host
subdir-$(CONFIG_USB_UHCI_ALT) += host
subdir-$(CONFIG_USB_OHCI) += host subdir-$(CONFIG_USB_OHCI) += host
subdir-$(CONFIG_USB_UHCI_ALT) += host
subdir-$(CONFIG_USB_UHCI) += host
ifeq ($(CONFIG_USB_HOST),y) ifeq ($(CONFIG_USB_HOST),y)
obj-y += host/usb-host.o obj-y += host/usb-host.o
endif endif
...@@ -24,45 +24,51 @@ endif ...@@ -24,45 +24,51 @@ endif
subdir-$(CONFIG_USB_ACM) += class subdir-$(CONFIG_USB_ACM) += class
subdir-$(CONFIG_USB_AUDIO) += class subdir-$(CONFIG_USB_AUDIO) += class
subdir-$(CONFIG_USB_BLUETOOTH) += class subdir-$(CONFIG_USB_BLUETOOTH) += class
subdir-$(CONFIG_USB_CDCETHER) += class
subdir-$(CONFIG_USB_HID) += class
subdir-$(CONFIG_USB_KBD) += class
subdir-$(CONFIG_USB_MOUSE) += class
subdir-$(CONFIG_USB_PRINTER) += class subdir-$(CONFIG_USB_PRINTER) += class
ifeq ($(CONFIG_USB_CLASS),y) ifeq ($(CONFIG_USB_CLASS),y)
obj-y += class/usb-class.o obj-y += class/usb-class.o
endif endif
subdir-$(CONFIG_USB_STORAGE) += class/storage subdir-$(CONFIG_USB_STORAGE) += storage
ifeq ($(CONFIG_USB_STORAGE),y) ifeq ($(CONFIG_USB_STORAGE),y)
obj-y += class/storage/storage.o obj-y += storage/storage.o
endif endif
subdir-$(CONFIG_USB_HID) += input
subdir-$(CONFIG_USB_KBD) += input
subdir-$(CONFIG_USB_MOUSE) += input
subdir-$(CONFIG_USB_WACOM) += input
ifeq ($(CONFIG_USB_INPUT),y)
obj-y += input/usb-input.o
endif
subdir-$(CONFIG_USB_DABUSB) += media
subdir-$(CONFIG_USB_DSBR) += media
subdir-$(CONFIG_USB_IBMCAM) += media subdir-$(CONFIG_USB_IBMCAM) += media
subdir-$(CONFIG_USB_KONICAWC) += media subdir-$(CONFIG_USB_KONICAWC) += media
subdir-$(CONFIG_USB_PWC) += media
subdir-$(CONFIG_USB_VICAM) += media
subdir-$(CONFIG_USB_OV511) += media subdir-$(CONFIG_USB_OV511) += media
subdir-$(CONFIG_USB_PWC) += media
subdir-$(CONFIG_USB_SE401) += media subdir-$(CONFIG_USB_SE401) += media
subdir-$(CONFIG_USB_STV680) += media subdir-$(CONFIG_USB_STV680) += media
subdir-$(CONFIG_USB_DSBR) += media subdir-$(CONFIG_USB_VICAM) += media
ifeq ($(CONFIG_USB_MEDIA),y) ifeq ($(CONFIG_USB_MEDIA),y)
obj-y += media/usb-media.o obj-y += media/usb-media.o
endif endif
subdir-$(CONFIG_USB_PEGASUS) += net
subdir-$(CONFIG_USB_RTL8150) += net
subdir-$(CONFIG_USB_CATC) += net subdir-$(CONFIG_USB_CATC) += net
subdir-$(CONFIG_USB_CDCETHER) += net
subdir-$(CONFIG_USB_KAWETH) += net subdir-$(CONFIG_USB_KAWETH) += net
subdir-$(CONFIG_USB_PEGASUS) += net
subdir-$(CONFIG_USB_RTL8150) += net
subdir-$(CONFIG_USB_USBNET) += net subdir-$(CONFIG_USB_USBNET) += net
ifeq ($(CONFIG_USB_NET),y) ifeq ($(CONFIG_USB_NET),y)
obj-y += net/usb-net.o obj-y += net/usb-net.o
endif endif
subdir-$(CONFIG_USB_DC2XX) += image subdir-$(CONFIG_USB_DC2XX) += image
subdir-$(CONFIG_USB_HPUSBSCSI) += image
subdir-$(CONFIG_USB_MDC800) += image subdir-$(CONFIG_USB_MDC800) += image
subdir-$(CONFIG_USB_MICROTEK) += image subdir-$(CONFIG_USB_MICROTEK) += image
subdir-$(CONFIG_USB_HPUSBSCSI) += image
subdir-$(CONFIG_USB_SCANNER) += image subdir-$(CONFIG_USB_SCANNER) += image
ifeq ($(CONFIG_USB_IMAGE),y) ifeq ($(CONFIG_USB_IMAGE),y)
obj-y += image/usb-image.o obj-y += image/usb-image.o
...@@ -74,12 +80,10 @@ ifeq ($(CONFIG_USB_SERIAL),y) ...@@ -74,12 +80,10 @@ ifeq ($(CONFIG_USB_SERIAL),y)
endif endif
subdir-$(CONFIG_USB_AUERSWALD) += misc subdir-$(CONFIG_USB_AUERSWALD) += misc
subdir-$(CONFIG_USB_DABUSB) += misc
subdir-$(CONFIG_USB_EMI26) += misc subdir-$(CONFIG_USB_EMI26) += misc
subdir-$(CONFIG_USB_RIO500) += misc subdir-$(CONFIG_USB_RIO500) += misc
subdir-$(CONFIG_USB_TIGL) += misc subdir-$(CONFIG_USB_TIGL) += misc
subdir-$(CONFIG_USB_USS720) += misc subdir-$(CONFIG_USB_USS720) += misc
subdir-$(CONFIG_USB_WACOM) += misc
ifeq ($(CONFIG_USB_MISC),y) ifeq ($(CONFIG_USB_MISC),y)
obj-y += misc/usb-misc.o obj-y += misc/usb-misc.o
endif endif
......
drivers/usb/class/Config.in
View file @ dff4eb9d
...@@ -4,44 +4,16 @@ ...@@ -4,44 +4,16 @@
comment 'USB Device Class drivers' comment 'USB Device Class drivers'
dep_tristate ' USB Audio support' CONFIG_USB_AUDIO $CONFIG_USB $CONFIG_SOUND dep_tristate ' USB Audio support' CONFIG_USB_AUDIO $CONFIG_USB $CONFIG_SOUND
dep_tristate ' USB Bluetooth support (EXPERIMENTAL)' CONFIG_USB_BLUETOOTH $CONFIG_USB $CONFIG_EXPERIMENTAL dep_tristate ' USB Bluetooth support (EXPERIMENTAL)' CONFIG_USB_BLUETOOTH $CONFIG_USB $CONFIG_EXPERIMENTAL
if [ "$CONFIG_SCSI" = "n" ]; then dep_tristate ' USB Modem (CDC ACM) support' CONFIG_USB_ACM $CONFIG_USB
comment ' SCSI support is needed for USB Storage' dep_tristate ' USB Printer support' CONFIG_USB_PRINTER $CONFIG_USB
fi
dep_tristate ' USB Mass Storage support' CONFIG_USB_STORAGE $CONFIG_USB $CONFIG_SCSI
dep_mbool ' USB Mass Storage verbose debug' CONFIG_USB_STORAGE_DEBUG $CONFIG_USB_STORAGE
dep_mbool ' Datafab MDCFE-B Compact Flash Reader support' CONFIG_USB_STORAGE_DATAFAB $CONFIG_USB_STORAGE $CONFIG_EXPERIMENTAL
dep_mbool ' Freecom USB/ATAPI Bridge support' CONFIG_USB_STORAGE_FREECOM $CONFIG_USB_STORAGE
dep_mbool ' ISD-200 USB/ATA Bridge support' CONFIG_USB_STORAGE_ISD200 $CONFIG_USB_STORAGE
dep_mbool ' Microtech CompactFlash/SmartMedia support' CONFIG_USB_STORAGE_DPCM $CONFIG_USB_STORAGE
dep_mbool ' HP CD-Writer 82xx support' CONFIG_USB_STORAGE_HP8200e $CONFIG_USB_STORAGE $CONFIG_EXPERIMENTAL
dep_mbool ' SanDisk SDDR-09 (and other SmartMedia) support' CONFIG_USB_STORAGE_SDDR09 $CONFIG_USB_STORAGE $CONFIG_EXPERIMENTAL
dep_mbool ' Lexar Jumpshot Compact Flash Reader' CONFIG_USB_STORAGE_JUMPSHOT $CONFIG_USB_STORAGE $CONFIG_EXPERIMENTAL
dep_tristate ' USB Modem (CDC ACM) support' CONFIG_USB_ACM $CONFIG_USB
dep_tristate ' USB CDC Ethernet support (EXPERIMENTAL)' CONFIG_USB_CDCETHER $CONFIG_USB $CONFIG_NET $CONFIG_EXPERIMENTAL
dep_tristate ' USB Printer support' CONFIG_USB_PRINTER $CONFIG_USB
comment 'USB Human Interface Devices (HID)'
dep_tristate ' USB Human Interface Device (full HID) support' CONFIG_USB_HID $CONFIG_USB
if [ "$CONFIG_INPUT" = "n" ]; then
comment ' Input core support is needed for USB HID input layer or HIDBP support'
fi
dep_mbool ' HID input layer support' CONFIG_USB_HIDINPUT $CONFIG_INPUT $CONFIG_USB_HID
dep_mbool ' /dev/hiddev raw HID device support' CONFIG_USB_HIDDEV $CONFIG_USB_HID
if [ "$CONFIG_USB_HID" != "y" ]; then
dep_tristate ' USB HIDBP Keyboard (basic) support' CONFIG_USB_KBD $CONFIG_USB $CONFIG_INPUT
dep_tristate ' USB HIDBP Mouse (basic) support' CONFIG_USB_MOUSE $CONFIG_USB $CONFIG_INPUT
fi
# Turn on CONFIG_USB_CLASS if any of the drivers are compiled into the kernel # Turn on CONFIG_USB_CLASS if any of the drivers are compiled into the kernel
# to make our Makefile logic a bit simpler. # to make our Makefile logic a bit simpler.
if [ "$CONFIG_USB_AUDIO" = "y" -o "$CONFIG_USB_BLUETOOTH" = "y" -o "$CONFIG_USB_ACM" = "y" ]; then if [ "$CONFIG_USB_AUDIO" = "y" -o "$CONFIG_USB_BLUETOOTH" = "y" ]; then
define_bool CONFIG_USB_CLASS y
fi
if [ "$CONFIG_USB_CDCETHER" = "y" -o "$CONFIG_USB_PRINTER" = "y" ]; then
define_bool CONFIG_USB_CLASS y define_bool CONFIG_USB_CLASS y
fi fi
if [ "$CONFIG_USB_HID" = "y" -o "$CONFIG_USB_KBD" = "y" -o "$CONFIG_USB_MOUSE" = "y" ]; then if [ "$CONFIG_USB_ACM" = "y" -o "$CONFIG_USB_PRINTER" = "y" ]; then
define_bool CONFIG_USB_CLASS y define_bool CONFIG_USB_CLASS y
fi fi
drivers/usb/class/Makefile
View file @ dff4eb9d
# #
# Makefile for USB Class drivers # Makefile for USB Class drivers
# (one step up from the misc category)
# #
O_TARGET := usb-class.o O_TARGET := usb-class.o
# Multipart objects.
hid-objs := hid-core.o
# Optional parts of multipart objects.
ifeq ($(CONFIG_USB_HIDDEV),y)
hid-objs += hiddev.o
endif
ifeq ($(CONFIG_USB_HIDINPUT),y)
hid-objs += hid-input.o
endif
obj-$(CONFIG_USB_ACM) += cdc-acm.o obj-$(CONFIG_USB_ACM) += cdc-acm.o
obj-$(CONFIG_USB_AUDIO) += audio.o obj-$(CONFIG_USB_AUDIO) += audio.o
obj-$(CONFIG_USB_BLUETOOTH) += bluetooth.o obj-$(CONFIG_USB_BLUETOOTH) += bluetooth.o
obj-$(CONFIG_USB_CDCETHER) += cdc-ether.o
obj-$(CONFIG_USB_HID) += hid.o
obj-$(CONFIG_USB_KBD) += usbkbd.o
obj-$(CONFIG_USB_MOUSE) += usbmouse.o
obj-$(CONFIG_USB_PRINTER) += printer.o obj-$(CONFIG_USB_PRINTER) += printer.o
......
drivers/usb/class/storage/Makefile deleted 100644 → 0
View file @ 03943afd
#
# Makefile for the USB Mass Storage device drivers.
#
# 15 Aug 2000, Christoph Hellwig <hch@infradead.org>
# Rewritten to use lists instead of if-statements.
#
O_TARGET := storage.o
EXTRA_CFLAGS := -I../../../scsi/
list-multi := usb-storage.o
obj-$(CONFIG_USB_STORAGE) += usb-storage.o
usb-storage-obj-$(CONFIG_USB_STORAGE_DEBUG) += debug.o
usb-storage-obj-$(CONFIG_USB_STORAGE_HP8200e) += shuttle_usbat.o
usb-storage-obj-$(CONFIG_USB_STORAGE_SDDR09) += sddr09.o
usb-storage-obj-$(CONFIG_USB_STORAGE_FREECOM) += freecom.o
usb-storage-obj-$(CONFIG_USB_STORAGE_SHUTTLE_SMARTMEDIA) += shuttle_sm.o
usb-storage-obj-$(CONFIG_USB_STORAGE_SHUTTLE_COMPACTFLASH) += shuttle_cf.o
usb-storage-obj-$(CONFIG_USB_STORAGE_DPCM) += dpcm.o
usb-storage-obj-$(CONFIG_USB_STORAGE_ISD200) += isd200.o
usb-storage-obj-$(CONFIG_USB_STORAGE_DATAFAB) += datafab.o
usb-storage-obj-$(CONFIG_USB_STORAGE_JUMPSHOT) += jumpshot.o
usb-storage-objs := scsiglue.o protocol.o transport.o usb.o \
initializers.o $(usb-storage-obj-y)
include $(TOPDIR)/Rules.make
usb-storage.o: $(usb-storage-objs)
$(LD) -r -o $@ $(usb-storage-objs)
drivers/usb/input/Config.in 0 → 100644
View file @ dff4eb9d
#
# USB Input driver configuration
#
comment 'USB Human Interface Devices (HID)'
dep_tristate ' USB Human Interface Device (full HID) support' CONFIG_USB_HID $CONFIG_USB
if [ "$CONFIG_INPUT" = "n" ]; then
comment ' Input core support is needed for USB HID input layer or HIDBP support'
fi
dep_mbool ' HID input layer support' CONFIG_USB_HIDINPUT $CONFIG_INPUT $CONFIG_USB_HID
dep_mbool ' /dev/hiddev raw HID device support' CONFIG_USB_HIDDEV $CONFIG_USB_HID
if [ "$CONFIG_USB_HID" != "y" ]; then
dep_tristate ' USB HIDBP Keyboard (basic) support' CONFIG_USB_KBD $CONFIG_USB $CONFIG_INPUT
dep_tristate ' USB HIDBP Mouse (basic) support' CONFIG_USB_MOUSE $CONFIG_USB $CONFIG_INPUT
fi
dep_tristate ' Wacom Intuos/Graphire tablet support' CONFIG_USB_WACOM $CONFIG_USB $CONFIG_INPUT
# Turn on CONFIG_USB_INPUT if any of the drivers are compiled into the kernel
# to make our Makefile logic a bit simpler.
if [ "$CONFIG_USB_HID" = "y" -o "$CONFIG_USB_KBD" = "y" -o "$CONFIG_USB_MOUSE" = "y" ]; then
define_bool CONFIG_USB_INPUT y
fi
if [ "$CONFIG_USB_WACOM" = "y" ]; then
define_bool CONFIG_USB_INPUT y
fi
drivers/usb/input/Makefile 0 → 100644
View file @ dff4eb9d
#
# Makefile for the USB input drivers
#
O_TARGET := usb-input.o
# Multipart objects.
hid-objs := hid-core.o
# Optional parts of multipart objects.
ifeq ($(CONFIG_USB_HIDDEV),y)
hid-objs += hiddev.o
endif
ifeq ($(CONFIG_USB_HIDINPUT),y)
hid-objs += hid-input.o
endif
obj-$(CONFIG_USB_HID) += hid.o
obj-$(CONFIG_USB_KBD) += usbkbd.o
obj-$(CONFIG_USB_MOUSE) += usbmouse.o
obj-$(CONFIG_USB_WACOM) += wacom.o
include $(TOPDIR)/Rules.make
drivers/usb/media/Config.in
View file @ dff4eb9d
...@@ -2,18 +2,18 @@ ...@@ -2,18 +2,18 @@
# USB Multimedia device configuration # USB Multimedia device configuration
# #
comment 'USB Multimedia devices' comment 'USB Multimedia devices'
dep_tristate ' DABUSB driver' CONFIG_USB_DABUSB $CONFIG_USB
if [ "$CONFIG_VIDEO_DEV" = "n" ]; then if [ "$CONFIG_VIDEO_DEV" = "n" ]; then
comment ' Video4Linux support is needed for USB Multimedia device support' comment ' Video4Linux support is needed for USB Multimedia device support'
else
dep_tristate ' USB IBM (Xirlink) C-it Camera support' CONFIG_USB_IBMCAM $CONFIG_USB $CONFIG_VIDEO_DEV
dep_tristate ' USB OV511 Camera support' CONFIG_USB_OV511 $CONFIG_USB $CONFIG_VIDEO_DEV
dep_tristate ' USB Philips Cameras' CONFIG_USB_PWC $CONFIG_USB $CONFIG_VIDEO_DEV
dep_tristate ' USB SE401 Camera support' CONFIG_USB_SE401 $CONFIG_USB $CONFIG_VIDEO_DEV
dep_tristate ' USB STV680 (Pencam) Camera support' CONFIG_USB_STV680 $CONFIG_USB $CONFIG_VIDEO_DEV
dep_tristate ' USB 3com HomeConnect (aka vicam) support (EXPERIMENTAL)' CONFIG_USB_VICAM $CONFIG_USB $CONFIG_VIDEO_DEV $CONFIG_EXPERIMENTAL
dep_tristate ' D-Link USB FM radio support (EXPERIMENTAL)' CONFIG_USB_DSBR $CONFIG_USB $CONFIG_VIDEO_DEV $CONFIG_EXPERIMENTAL
dep_tristate ' USB Konica Webcam support' CONFIG_USB_KONICAWC $CONFIG_USB $CONFIG_VIDEO_DEV
fi fi
dep_tristate ' USB 3com HomeConnect (aka vicam) support (EXPERIMENTAL)' CONFIG_USB_VICAM $CONFIG_USB $CONFIG_VIDEO_DEV $CONFIG_EXPERIMENTAL
dep_tristate ' D-Link USB FM radio support (EXPERIMENTAL)' CONFIG_USB_DSBR $CONFIG_USB $CONFIG_VIDEO_DEV $CONFIG_EXPERIMENTAL
dep_tristate ' USB IBM (Xirlink) C-it Camera support' CONFIG_USB_IBMCAM $CONFIG_USB $CONFIG_VIDEO_DEV
dep_tristate ' USB Konica Webcam support' CONFIG_USB_KONICAWC $CONFIG_USB $CONFIG_VIDEO_DEV
dep_tristate ' USB OV511 Camera support' CONFIG_USB_OV511 $CONFIG_USB $CONFIG_VIDEO_DEV
dep_tristate ' USB Philips Cameras' CONFIG_USB_PWC $CONFIG_USB $CONFIG_VIDEO_DEV
dep_tristate ' USB SE401 Camera support' CONFIG_USB_SE401 $CONFIG_USB $CONFIG_VIDEO_DEV
dep_tristate ' USB STV680 (Pencam) Camera support' CONFIG_USB_STV680 $CONFIG_USB $CONFIG_VIDEO_DEV
# Turn on CONFIG_USB_MEDIA if any of the drivers are compiled into the kernel # Turn on CONFIG_USB_MEDIA if any of the drivers are compiled into the kernel
# to make our Makefile logic a bit simpler # to make our Makefile logic a bit simpler
...@@ -23,7 +23,7 @@ fi ...@@ -23,7 +23,7 @@ fi
if [ "$CONFIG_USB_SE401" = "y" -o "$CONFIG_USB_STV680" = "y" -o "$CONFIG_USB_VICAM" = "y" ]; then if [ "$CONFIG_USB_SE401" = "y" -o "$CONFIG_USB_STV680" = "y" -o "$CONFIG_USB_VICAM" = "y" ]; then
define_bool CONFIG_USB_MEDIA y define_bool CONFIG_USB_MEDIA y
fi fi
if [ "$CONFIG_USB_DSBR" = "y" -o "$CONFIG_USB_KONICAWC" = "y" ]; then if [ "$CONFIG_USB_DSBR" = "y" -o "$CONFIG_USB_KONICAWC" = "y" -o "$CONFIG_USB_DABUSB" = "y" ]; then
define_bool CONFIG_USB_MEDIA y define_bool CONFIG_USB_MEDIA y
fi fi
drivers/usb/media/Makefile
View file @ dff4eb9d
...@@ -8,6 +8,7 @@ export-objs := ov511.o pwc-uncompress.o ...@@ -8,6 +8,7 @@ export-objs := ov511.o pwc-uncompress.o
pwc-objs := pwc-if.o pwc-misc.o pwc-ctrl.o pwc-uncompress.o pwc-objs := pwc-if.o pwc-misc.o pwc-ctrl.o pwc-uncompress.o
obj-$(CONFIG_USB_DABUSB) += dabusb.o
obj-$(CONFIG_USB_DSBR) += dsbr100.o obj-$(CONFIG_USB_DSBR) += dsbr100.o
obj-$(CONFIG_USB_IBMCAM) += ibmcam.o usbvideo.o ultracam.o obj-$(CONFIG_USB_IBMCAM) += ibmcam.o usbvideo.o ultracam.o
obj-$(CONFIG_USB_KONICAWC) += konicawc.o usbvideo.o obj-$(CONFIG_USB_KONICAWC) += konicawc.o usbvideo.o
......
drivers/usb/misc/Makefile
View file @ dff4eb9d
...@@ -6,11 +6,9 @@ ...@@ -6,11 +6,9 @@
O_TARGET := usb-misc.o O_TARGET := usb-misc.o
obj-$(CONFIG_USB_AUERSWALD) += auerswald.o obj-$(CONFIG_USB_AUERSWALD) += auerswald.o
obj-$(CONFIG_USB_DABUSB) += dabusb.o
obj-$(CONFIG_USB_EMI26) += emi26.o obj-$(CONFIG_USB_EMI26) += emi26.o
obj-$(CONFIG_USB_RIO500) += rio500.o obj-$(CONFIG_USB_RIO500) += rio500.o
obj-$(CONFIG_USB_TIGL) += tiglusb.o obj-$(CONFIG_USB_TIGL) += tiglusb.o
obj-$(CONFIG_USB_USS720) += uss720.o obj-$(CONFIG_USB_USS720) += uss720.o
obj-$(CONFIG_USB_WACOM) += wacom.o
include $(TOPDIR)/Rules.make include $(TOPDIR)/Rules.make
drivers/usb/net/Config.in
View file @ dff4eb9d
...@@ -5,10 +5,11 @@ comment 'USB Network adaptors' ...@@ -5,10 +5,11 @@ comment 'USB Network adaptors'
if [ "$CONFIG_NET" = "n" ]; then if [ "$CONFIG_NET" = "n" ]; then
comment ' Networking support is needed for USB Networking device support' comment ' Networking support is needed for USB Networking device support'
else else
dep_tristate ' USB CATC NetMate-based Ethernet device support (EXPERIMENTAL)' CONFIG_USB_CATC $CONFIG_USB $CONFIG_NET $CONFIG_EXPERIMENTAL
dep_tristate ' USB CDC Ethernet support (EXPERIMENTAL)' CONFIG_USB_CDCETHER $CONFIG_USB $CONFIG_NET $CONFIG_EXPERIMENTAL
dep_tristate ' USB KLSI KL5USB101-based ethernet device support (EXPERIMENTAL)' CONFIG_USB_KAWETH $CONFIG_USB $CONFIG_NET $CONFIG_EXPERIMENTAL
dep_tristate ' USB Pegasus/Pegasus-II based ethernet device support (EXPERIMENTAL)' CONFIG_USB_PEGASUS $CONFIG_USB $CONFIG_NET $CONFIG_EXPERIMENTAL dep_tristate ' USB Pegasus/Pegasus-II based ethernet device support (EXPERIMENTAL)' CONFIG_USB_PEGASUS $CONFIG_USB $CONFIG_NET $CONFIG_EXPERIMENTAL
dep_tristate ' USB RTL8150 based ethernet device support (EXPERIMENTAL)' CONFIG_USB_RTL8150 $CONFIG_USB $CONFIG_NET $CONFIG_EXPERIMENTAL dep_tristate ' USB RTL8150 based ethernet device support (EXPERIMENTAL)' CONFIG_USB_RTL8150 $CONFIG_USB $CONFIG_NET $CONFIG_EXPERIMENTAL
dep_tristate ' USB KLSI KL5USB101-based ethernet device support (EXPERIMENTAL)' CONFIG_USB_KAWETH $CONFIG_USB $CONFIG_NET $CONFIG_EXPERIMENTAL
dep_tristate ' USB CATC NetMate-based Ethernet device support (EXPERIMENTAL)' CONFIG_USB_CATC $CONFIG_USB $CONFIG_NET $CONFIG_EXPERIMENTAL
dep_tristate ' USB-to-USB Networking cable device support (EXPERIMENTAL)' CONFIG_USB_USBNET $CONFIG_USB $CONFIG_NET $CONFIG_EXPERIMENTAL dep_tristate ' USB-to-USB Networking cable device support (EXPERIMENTAL)' CONFIG_USB_USBNET $CONFIG_USB $CONFIG_NET $CONFIG_EXPERIMENTAL
fi fi
...@@ -17,7 +18,7 @@ fi ...@@ -17,7 +18,7 @@ fi
if [ "$CONFIG_USB_PEGASUS" = "y" -o "$CONFIG_USB_RTL8150" = "y" -o "$CONFIG_USB_KAWETH" = "y" ]; then if [ "$CONFIG_USB_PEGASUS" = "y" -o "$CONFIG_USB_RTL8150" = "y" -o "$CONFIG_USB_KAWETH" = "y" ]; then
define_bool CONFIG_USB_NET y define_bool CONFIG_USB_NET y
fi fi
if [ "$CONFIG_USB_CATC" = "y" -o "$CONFIG_USB_USBNET" = "y" ]; then if [ "$CONFIG_USB_CATC" = "y" -o "$CONFIG_USB_USBNET" = "y" -o "$CONFIG_USB_CDCETHER" = "y" ]; then
define_bool CONFIG_USB_NET y define_bool CONFIG_USB_NET y
fi fi
drivers/usb/net/Makefile
View file @ dff4eb9d
...@@ -5,6 +5,7 @@ ...@@ -5,6 +5,7 @@
O_TARGET := usb-net.o O_TARGET := usb-net.o
obj-$(CONFIG_USB_CATC) += catc.o obj-$(CONFIG_USB_CATC) += catc.o
obj-$(CONFIG_USB_CDCETHER) += cdc-ether.o
obj-$(CONFIG_USB_KAWETH) += kaweth.o obj-$(CONFIG_USB_KAWETH) += kaweth.o
obj-$(CONFIG_USB_PEGASUS) += pegasus.o obj-$(CONFIG_USB_PEGASUS) += pegasus.o
obj-$(CONFIG_USB_RTL8150) += rtl8150.o obj-$(CONFIG_USB_RTL8150) += rtl8150.o
......
drivers/usb/storage/Config.in 0 → 100644
View file @ dff4eb9d
#
# USB Storage driver configuration
#
if [ "$CONFIG_SCSI" = "n" ]; then
comment ' SCSI support is needed for USB Storage'
fi
dep_tristate ' USB Mass Storage support' CONFIG_USB_STORAGE $CONFIG_USB $CONFIG_SCSI
dep_mbool ' USB Mass Storage verbose debug' CONFIG_USB_STORAGE_DEBUG $CONFIG_USB_STORAGE
dep_mbool ' Datafab MDCFE-B Compact Flash Reader support' CONFIG_USB_STORAGE_DATAFAB $CONFIG_USB_STORAGE $CONFIG_EXPERIMENTAL
dep_mbool ' Freecom USB/ATAPI Bridge support' CONFIG_USB_STORAGE_FREECOM $CONFIG_USB_STORAGE
dep_mbool ' ISD-200 USB/ATA Bridge support' CONFIG_USB_STORAGE_ISD200 $CONFIG_USB_STORAGE
dep_mbool ' Microtech CompactFlash/SmartMedia support' CONFIG_USB_STORAGE_DPCM $CONFIG_USB_STORAGE
dep_mbool ' HP CD-Writer 82xx support' CONFIG_USB_STORAGE_HP8200e $CONFIG_USB_STORAGE $CONFIG_EXPERIMENTAL
dep_mbool ' SanDisk SDDR-09 (and other SmartMedia) support' CONFIG_USB_STORAGE_SDDR09 $CONFIG_USB_STORAGE $CONFIG_EXPERIMENTAL
dep_mbool ' Lexar Jumpshot Compact Flash Reader' CONFIG_USB_STORAGE_JUMPSHOT $CONFIG_USB_STORAGE $CONFIG_EXPERIMENTAL
drivers/usb/storage/Makefile 0 → 100644
View file @ dff4eb9d
#
# Makefile for the USB Mass Storage device drivers.
#
# 15 Aug 2000, Christoph Hellwig <hch@infradead.org>
# Rewritten to use lists instead of if-statements.
#
O_TARGET := storage.o
EXTRA_CFLAGS := -I../../scsi/
obj-$(CONFIG_USB_STORAGE) += usb-storage.o
usb-storage-obj-$(CONFIG_USB_STORAGE_DEBUG) += debug.o
usb-storage-obj-$(CONFIG_USB_STORAGE_HP8200e) += shuttle_usbat.o
usb-storage-obj-$(CONFIG_USB_STORAGE_SDDR09) += sddr09.o
usb-storage-obj-$(CONFIG_USB_STORAGE_FREECOM) += freecom.o
usb-storage-obj-$(CONFIG_USB_STORAGE_SHUTTLE_SMARTMEDIA) += shuttle_sm.o
usb-storage-obj-$(CONFIG_USB_STORAGE_SHUTTLE_COMPACTFLASH) += shuttle_cf.o
usb-storage-obj-$(CONFIG_USB_STORAGE_DPCM) += dpcm.o
usb-storage-obj-$(CONFIG_USB_STORAGE_ISD200) += isd200.o
usb-storage-obj-$(CONFIG_USB_STORAGE_DATAFAB) += datafab.o
usb-storage-obj-$(CONFIG_USB_STORAGE_JUMPSHOT) += jumpshot.o
usb-storage-objs := scsiglue.o protocol.o transport.o usb.o \
initializers.o $(usb-storage-obj-y)
include $(TOPDIR)/Rules.make
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7