diff options
| author | Greg Kroah-Hartman <greg@kroah.com> | 2005-01-09 19:28:21 -0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <greg@kroah.com> | 2005-01-09 19:28:21 -0800 |
| commit | cb7d9f1d9a6a0c9291afc713ab7d0920cf7f88a6 (patch) | |
| tree | d2e8843ef3dfc60ab65f7e674100fae35ef6bd83 /arch | |
| parent | cf4a33ef7ef44ef97446527317254783d5f448de (diff) | |
| parent | 960940e00f79a7672c92d32ac47198f0bb825a9a (diff) | |
| download | history-cb7d9f1d9a6a0c9291afc713ab7d0920cf7f88a6.tar.gz | |
Merge kroah.com:/home/greg/linux/BK/bleed-2.6
into kroah.com:/home/greg/linux/BK/usb-2.6
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/ia64/Kconfig | 13 | ||||
| -rw-r--r-- | arch/mips/au1000/common/usbdev.c | 6 | ||||
| -rw-r--r-- | arch/ppc64/Kconfig | 3 | ||||
| -rw-r--r-- | arch/s390/Kconfig | 3 |
4 files changed, 14 insertions, 11 deletions
diff --git a/arch/ia64/Kconfig b/arch/ia64/Kconfig index 4cbcf366e3f8a5..0b87da9d55b57a 100644 --- a/arch/ia64/Kconfig +++ b/arch/ia64/Kconfig @@ -249,13 +249,14 @@ config NR_CPUS performance hit. config HOTPLUG_CPU - bool "Support for hot-pluggable CPUs (EXPERIMENTAL)" - depends on SMP && HOTPLUG && EXPERIMENTAL + bool "Support for hot-pluggable CPUs (EXPERIMENTAL)" + depends on SMP && EXPERIMENTAL + select HOTPLUG default n - ---help--- - Say Y here to experiment with turning CPUs off and on. CPUs - can be controlled through /sys/devices/system/cpu/cpu#. - Say N if you want to disable CPU hotplug. + ---help--- + Say Y here to experiment with turning CPUs off and on. CPUs + can be controlled through /sys/devices/system/cpu/cpu#. + Say N if you want to disable CPU hotplug. config PREEMPT bool "Preemptible Kernel" diff --git a/arch/mips/au1000/common/usbdev.c b/arch/mips/au1000/common/usbdev.c index a73a31655c572c..447a9a4612a88d 100644 --- a/arch/mips/au1000/common/usbdev.c +++ b/arch/mips/au1000/common/usbdev.c @@ -766,7 +766,7 @@ do_get_descriptor(struct usb_dev* dev, struct usb_ctrlrequest* setup) dev->conf_desc), 0); } else { - int len = dev->conf_desc->wTotalLength; + int len = le16_to_cpu(dev->conf_desc->wTotalLength); dbg("sending whole config desc," " size=%d, our size=%d", desc_len, len); desc_len = desc_len > len ? len : desc_len; @@ -1398,7 +1398,7 @@ usbdev_init(struct usb_device_descriptor* dev_desc, epd->bEndpointAddress |= (u8)ep->address; ep->direction = epd->bEndpointAddress & 0x80; ep->type = epd->bmAttributes & 0x03; - ep->max_pkt_size = epd->wMaxPacketSize; + ep->max_pkt_size = le16_to_cpu(epd->wMaxPacketSize); spin_lock_init(&ep->lock); ep->desc = epd; ep->reg = &ep_reg[ep->address]; @@ -1407,7 +1407,7 @@ usbdev_init(struct usb_device_descriptor* dev_desc, /* * initialize the full config descriptor */ - usbdev.full_conf_desc = fcd = kmalloc(config_desc->wTotalLength, + usbdev.full_conf_desc = fcd = kmalloc(le16_to_cpu(config_desc->wTotalLength), ALLOC_FLAGS); if (!fcd) { err("failed to alloc full config descriptor"); diff --git a/arch/ppc64/Kconfig b/arch/ppc64/Kconfig index 2c490c77ca368e..0bc438f7edca6f 100644 --- a/arch/ppc64/Kconfig +++ b/arch/ppc64/Kconfig @@ -305,7 +305,8 @@ source "drivers/pci/Kconfig" config HOTPLUG_CPU bool "Support for hot-pluggable CPUs" - depends on SMP && HOTPLUG && EXPERIMENTAL && PPC_PSERIES + depends on SMP && EXPERIMENTAL && PPC_PSERIES + select HOTPLUG ---help--- Say Y here to be able to turn CPUs off and on. diff --git a/arch/s390/Kconfig b/arch/s390/Kconfig index 6dda135eb53797..85ecab32be8915 100644 --- a/arch/s390/Kconfig +++ b/arch/s390/Kconfig @@ -85,7 +85,8 @@ config NR_CPUS config HOTPLUG_CPU bool "Support for hot-pluggable CPUs (EXPERIMENTAL)" - depends on SMP && HOTPLUG && EXPERIMENTAL + depends on SMP && EXPERIMENTAL + select HOTPLUG default n help Say Y here to experiment with turning CPUs off and on. CPUs |