diff options
| author | James Bottomley <jejb@mulgrave.il.steeleye.com> | 2006-08-06 13:42:33 -0400 |
|---|---|---|
| committer | James Bottomley <jejb@mulgrave.il.steeleye.com> | 2006-08-06 13:42:33 -0400 |
| commit | 00dd7b7d26a3bf3780cfcebfdde2b86126b3a082 (patch) | |
| tree | 5129fd1abc99d0c58a520938f28bf330ae94ef30 /drivers/usb/Kconfig | |
| parent | 58b3ac07fed31ffc1349380b78305af6522fe1f4 (diff) | |
| parent | 6e1e63259b1e01f047796e7985d960ca040993e6 (diff) | |
Merge ../linux-2.6
Conflicts:
arch/ia64/hp/sim/simscsi.c
Stylistic differences in two separate fixes for buffer->request_buffer
problem.
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
Diffstat (limited to 'drivers/usb/Kconfig')
| -rw-r--r-- | drivers/usb/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/usb/Kconfig b/drivers/usb/Kconfig index 2ee742d40c4..00504319752 100644 --- a/drivers/usb/Kconfig +++ b/drivers/usb/Kconfig | |||
| @@ -24,7 +24,7 @@ config USB_ARCH_HAS_OHCI | |||
| 24 | default y if ARCH_S3C2410 | 24 | default y if ARCH_S3C2410 |
| 25 | default y if PXA27x | 25 | default y if PXA27x |
| 26 | default y if ARCH_EP93XX | 26 | default y if ARCH_EP93XX |
| 27 | default y if ARCH_AT91RM9200 | 27 | default y if (ARCH_AT91RM9200 || ARCH_AT91SAM9261) |
| 28 | # PPC: | 28 | # PPC: |
| 29 | default y if STB03xxx | 29 | default y if STB03xxx |
| 30 | default y if PPC_MPC52xx | 30 | default y if PPC_MPC52xx |