Patched in Tegra support.

1 files changed, 54 insertions, 1 deletions

diff --git a/drivers/usb/core/Kconfig b/drivers/usb/core/Kconfig
index f70c1a1694a..18d02e32a3d 100644
--- a/drivers/usb/core/Kconfig
+++ b/drivers/usb/core/Kconfig
@@ -27,6 +27,58 @@ config USB_ANNOUNCE_NEW_DEVICES
 comment "Miscellaneous USB options"
         depends on USB
 
+config USB_DEVICEFS
+        bool "USB device filesystem (DEPRECATED)"
+        depends on USB
+        ---help---
+          If you say Y here (and to "/proc file system support" in the "File
+          systems" section, above), you will get a file /proc/bus/usb/devices
+          which lists the devices currently connected to your USB bus or
+          busses, and for every connected device a file named
+          "/proc/bus/usb/xxx/yyy", where xxx is the bus number and yyy the
+          device number; the latter files can be used by user space programs
+          to talk directly to the device. These files are "virtual", meaning
+          they are generated on the fly and not stored on the hard drive.
+
+          You may need to mount the usbfs file system to see the files, use
+          mount -t usbfs none /proc/bus/usb
+
+          For the format of the various /proc/bus/usb/ files, please read
+          <file:Documentation/usb/proc_usb_info.txt>.
+
+          Modern Linux systems do not use this.
+
+          Usbfs entries are files and not character devices; usbfs can't
+          handle Access Control Lists (ACL) which are the default way to
+          grant access to USB devices for untrusted users of a desktop
+          system.
+
+          The usbfs functionality is replaced by real device-nodes managed by
+          udev.  These nodes lived in /dev/bus/usb and are used by libusb.
+
+config USB_DEVICE_CLASS
+        bool "USB device class-devices (DEPRECATED)"
+        depends on USB
+        default y
+        ---help---
+          Userspace access to USB devices is granted by device-nodes exported
+          directly from the usbdev in sysfs. Old versions of the driver
+          core and udev needed additional class devices to export device nodes.
+
+          These additional devices are difficult to handle in userspace, if
+          information about USB interfaces must be available. One device
+          contains the device node, the other device contains the interface
+          data. Both devices are at the same level in sysfs (siblings) and one
+          can't access the other. The device node created directly by the
+          usb device is the parent device of the interface and therefore
+          easily accessible from the interface event.
+
+          This option provides backward compatibility for libusb device
+          nodes (lsusb) when usbfs is not used, and the following udev rule
+          doesn't exist:
+            SUBSYSTEM=="usb", ACTION=="add", ENV{DEVTYPE}=="usb_device", \
+            NAME="bus/usb/$env{BUSNUM}/$env{DEVNUM}", MODE="0644"
+
 config USB_DYNAMIC_MINORS
         bool "Dynamic USB minor allocation"
         depends on USB
@@ -56,7 +108,7 @@ config USB_SUSPEND
 
 config USB_OTG
         bool "OTG support"
-        depends on USB
+        depends on USB && EXPERIMENTAL
         depends on USB_SUSPEND
         default n
         help
@@ -73,6 +125,7 @@ config USB_OTG_WHITELIST
         bool "Rely on OTG Targeted Peripherals List"
         depends on USB_OTG || EXPERT
         default y if USB_OTG
+        default n if EXPERT
         help
           If you say Y here, the "otg_whitelist.h" file will be used as a
           product whitelist, so USB peripherals not listed there will be