diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-09-02 02:17:56 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-09-02 02:17:56 -0400 |
| commit | 936e894a976dd3b0f07f1f6f43c17b77b7e6146d (patch) | |
| tree | 5ed5c1f6735dcd26550594df23c8f7fe2aa21a15 /drivers/usb/misc/Kconfig | |
| parent | 69575d388603365f2afbf4166df93152df59b165 (diff) | |
| parent | 326ba5010a5429a5a528b268b36a5900d4ab0eba (diff) | |
Merge commit 'v2.6.31-rc8' into x86/txt
Conflicts:
arch/x86/kernel/reboot.c
security/Kconfig
Merge reason: resolve the conflicts, bump up from rc3 to rc8.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
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, |