Sarah Sharp
b01bcbf7ae
xhci: Fix compile with CONFIG_USB_SUSPEND=n ...
The USB 2.0 Link PM code is conditionally compiled when
CONFIG_USB_SUSPEND=y. I believe that's a mistake, since Link PM is not
directly related to USB device suspend and Link PM is implemented
without relying on any of the suspend code in the USB core. For now,
keep the USB 2.0 Link PM code conditionally compiled if
CONFIG_USB_SUSPEND=y.
This patch does move the code to implement USB 3.0 Link PM out of the
xHCI driver #ifdefs for CONFIG_USB_SUSPEND and moves it into a section
dependent on CONFIG_PM. The USB core functions for USB 3.0 Link PM are
already conditionally compiled when CONFIG_PM=y.
Signed-off-by: Sarah Sharp <sarah.a.sharp@linux.intel.com>
2012-05-21 09:00:05 -07:00
ACPI: Add _PLD support
2012-05-11 17:03:12 -07:00
ARM: 7366/3: amba: Remove AMBA level regulator support
2012-04-13 14:04:08 +01:00
Change summary:
2012-05-03 17:16:52 -07:00
Remove all #inclusions of asm/system.h
2012-03-28 18:30:03 +01:00
regmap: fix possible memory corruption in regmap_bulk_read()
2012-05-09 15:44:11 +01:00
Merge 3.4-rc6 into usb-next
2012-05-07 09:03:39 -07:00
connector/userns: replace netlink uses of cap_raised() with capable()
2012-05-10 23:21:39 -04:00
USB: Disable hub-initiated LPM for comms devices.
2012-05-18 15:42:55 -07:00
tty and serial fixes for 3.4-rc2
2012-04-12 15:36:33 -07:00
Revert "clocksource: Load the ACPI PM clocksource asynchronously"
2012-04-12 00:05:05 +02:00
cpufreq: OMAP: fix build errors: depends on ARCH_OMAP2PLUS
2012-04-13 17:57:40 -07:00
Merge branches 'idle-fix' and 'misc' into release
2012-04-06 21:48:59 -04:00
crypto: talitos - properly lock access to global talitos registers
2012-04-09 15:13:40 +08:00
ARM: global cleanups
2012-03-27 16:03:32 -07:00
Merge branch 'fixes' of git://git.infradead.org/users/vkoul/slave-dma
2012-04-26 15:33:36 -07:00
Merge branch 'stable' of git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile
2012-04-06 17:56:20 -07:00
Remove all #inclusions of asm/system.h
2012-03-28 18:30:03 +01:00
efivars: Improve variable validation
2012-05-03 17:19:19 -07:00
gpio/exynos: Fix compiler warnings when non-exynos machines are selected
2012-05-11 18:25:53 -06:00
drm/nouveau/i2c: resume use of i2c-algo-bit, rather than custom stack
2012-05-07 11:02:38 +01:00
USB: hid-core.c: remove dbg() usage
2012-05-01 21:32:55 -07:00
HSI: hsi_char: Remove max_data_size from sysfs
2012-04-23 14:23:32 +03:00
hwmon: (coretemp) Increase CPU core limit
2012-05-01 09:16:14 -07:00
i2c: mxs: disable QUEUE when sending is done
2012-04-27 16:13:29 +02:00
Remove all #inclusions of asm/system.h
2012-03-28 18:30:03 +01:00
simple_open: automatically convert to simple_open()
2012-04-05 15:25:50 -07:00
A few fixes for regressions introduced in 3.4-rc1:
2012-04-26 15:35:35 -07:00
Merge 3.4-rc6 into usb-next
2012-05-07 09:03:39 -07:00
Merge branch 'akpm' (Andrew's patch-bomb)
2012-04-05 15:30:34 -07:00
USB: Disable hub-initiated LPM for comms devices.
2012-05-18 15:42:55 -07:00
drivers/leds: correct __devexit annotations
2012-05-10 15:06:44 -07:00
Remove all #inclusions of asm/system.h
2012-03-28 18:30:03 +01:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2012-05-12 12:57:01 -07:00
USB: hdpvr-core.c: remove err() usage
2012-04-25 14:48:49 -07:00
Disintegrate and delete asm/system.h
2012-03-28 15:58:21 -07:00
mfd: Fix build breakage in omap-usb-host.c
2012-05-01 11:55:04 +02:00
Merge branch 'akpm' (Andrew's patch-bomb)
2012-04-05 15:30:34 -07:00
Merge branch 'fixes' of git://git.infradead.org/users/vkoul/slave-dma
2012-04-26 15:33:36 -07:00
Merge branch 'fixes' of git://git.infradead.org/users/vkoul/slave-dma
2012-04-26 15:33:36 -07:00
brcm80211: Fix compile error for .disable_hub_initiated_lpm.
2012-05-21 08:59:19 -07:00
Remove all #inclusions of asm/system.h
2012-03-28 18:30:03 +01:00
gpio: Fix range check in of_gpio_simple_xlate()
2012-04-10 14:20:56 -06:00
simple_open: automatically convert to simple_open()
2012-04-05 15:25:50 -07:00
parisc: move definition of PAGE0 to asm/page.h
2012-05-10 15:12:08 -07:00
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux
2012-05-05 10:06:06 -07:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia
2012-03-29 16:00:48 -07:00
pinctrl: implement pinctrl_check_ops
2012-04-11 09:31:02 +02:00
Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
2012-05-06 12:19:38 -07:00
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux
2012-03-30 16:45:39 -07:00
Various small bugfixes and enhancements, plus two new drivers:
2012-03-30 16:09:02 -07:00
regulator: Actually free the regulator in devm_regulator_put()
2012-05-07 13:14:44 +01:00
simple_open: automatically convert to simple_open()
2012-04-05 15:25:50 -07:00
Merge branch 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
2012-05-04 15:35:09 -07:00
qeth: Use blkt defaults for OSA Express 4
2012-04-24 00:33:17 -04:00
Remove all #inclusions of asm/system.h
2012-03-28 18:30:03 +01:00
[SCSI] virtio_scsi: fix TMF use-after-free
2012-05-10 08:27:06 +01:00
SuperH updates for 3.4 merge window
2012-03-30 00:09:17 -07:00
spi/spi-bfin5xx: Fix flush of last bit after each spi transfer
2012-04-27 12:20:39 -06:00
staging: usb: gadget: Add FunctionFS support to Configurable Composite Gadget driver
2012-05-16 05:32:20 -07:00
target: Drop incorrect se_lun_acl release for dynamic -> explict ACL conversion
2012-05-11 14:55:19 -07:00
TTY fix for 3.4-rc5
2012-05-02 13:47:49 -07:00
xhci: Fix compile with CONFIG_USB_SUSPEND=n
2012-05-21 09:00:05 -07:00
uwb: fix error handling
2012-04-18 13:15:51 -07:00
vhost-net: fix handle_rx buffer size
2012-05-11 18:16:57 -04:00
Merge branch 'v3.5-for-usb' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into usb-next
2012-05-17 09:14:21 -07:00
virtio_balloon: fix handling of PAGE_SIZE != 4k
2012-04-15 11:51:06 +03:00
hpwdt: Only BYTE reads/writes to WD Timer port 0x72
2012-04-26 14:38:07 +02:00
xen/Kconfig: fix Kconfig layout
2012-05-07 12:26:28 -04:00
Merge branch 'for-next' of git://gitorious.org/kernel-hsi/kernel-hsi
2012-04-02 09:50:40 -07:00
Merge branch 'for-next' of git://gitorious.org/kernel-hsi/kernel-hsi
2012-04-02 09:50:40 -07:00
b01bcbf7ae