diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2009-09-12 07:02:26 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-09-12 07:02:26 -0400 |
| commit | ddd559b13f6d2fe3ad68c4b3f5235fd3c2eae4e3 (patch) | |
| tree | d827bca3fc825a0ac33efbcd493713be40fcc812 /drivers/usb/misc/Kconfig | |
| parent | cf7a2b4fb6a9b86779930a0a123b0df41aa9208f (diff) | |
| parent | f17a1f06d2fa93f4825be572622eb02c4894db4e (diff) | |
Merge branch 'devel-stable' into devel
Conflicts:
MAINTAINERS
arch/arm/mm/fault.c
Diffstat (limited to 'drivers/usb/misc/Kconfig')
| -rw-r--r-- | drivers/usb/misc/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/usb/misc/Kconfig b/drivers/usb/misc/Kconfig index a68d91a11bee..abe3aa67ed00 100644 --- a/drivers/usb/misc/Kconfig +++ b/drivers/usb/misc/Kconfig | |||
| @@ -220,7 +220,7 @@ config USB_IOWARRIOR | |||
| 220 | 220 | ||
| 221 | config USB_TEST | 221 | config USB_TEST |
| 222 | tristate "USB testing driver" | 222 | tristate "USB testing driver" |
| 223 | depends on USB && USB_DEVICEFS | 223 | depends on USB |
| 224 | help | 224 | help |
| 225 | This driver is for testing host controller software. It is used | 225 | This driver is for testing host controller software. It is used |
| 226 | with specialized device firmware for regression and stress testing, | 226 | with specialized device firmware for regression and stress testing, |