OpenCloudOS-Kernel/arch/arm
Russell King 29ea23ff90 ARM: Make consolidated PM sleep code depend on PM_SLEEP
CONFIG_PM is now set whenever we support either runtime PM in addition
to suspend and hibernate.  This causes build errors when runtime PM is
enabled on a platform, but the CPU does not have the appropriate support
for suspend.

So, switch this code to use CONFIG_PM_SLEEP rather than CONFIG_PM to
allow runtime PM to be enabled without causing build errors.

Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
2011-04-02 10:08:55 +01:00
..
boot ARM: 6826/1: Merge v6 and v7 DEBUG_LL DCC support 2011-03-28 19:01:43 +01:00
common arm: Fold irq_set_chip/irq_set_handler 2011-03-29 14:47:58 +02:00
configs Merge branch 'for-linus' of git://android.git.kernel.org/kernel/tegra 2011-03-24 09:33:14 -07:00
include/asm Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm 2011-03-30 07:50:45 -07:00
kernel ARM: Make consolidated PM sleep code depend on PM_SLEEP 2011-04-02 10:08:55 +01:00
lib Merge branches 'fixes', 'pgt-next' and 'versatile' into devel 2011-03-20 09:32:12 +00:00
mach-at91 arm: Fold irq_set_chip/irq_set_handler 2011-03-29 14:47:58 +02:00
mach-bcmring arm: Cleanup the irq namespace 2011-03-29 14:47:57 +02:00
mach-clps711x arm: Fold irq_set_chip/irq_set_handler 2011-03-29 14:47:58 +02:00
mach-cns3xxx ARM: P2V: separate PHYS_OFFSET from platform definitions 2011-02-17 23:26:55 +00:00
mach-davinci arm: Cleanup the irq namespace 2011-03-29 14:47:57 +02:00
mach-dove arm: Fold irq_set_chip/irq_set_handler 2011-03-29 14:47:58 +02:00
mach-ebsa110 arm: Fold irq_set_chip/irq_set_handler 2011-03-29 14:47:58 +02:00
mach-ep93xx arm: Fold irq_set_chip/irq_set_handler 2011-03-29 14:47:58 +02:00
mach-exynos4 arm: Fold irq_set_chip/irq_set_handler 2011-03-29 14:47:58 +02:00
mach-footbridge arm: Fold irq_set_chip/irq_set_handler 2011-03-29 14:47:58 +02:00
mach-gemini arm: Fold irq_set_chip/irq_set_handler 2011-03-29 14:47:58 +02:00
mach-h720x arm: Fold irq_set_chip/irq_set_handler 2011-03-29 14:47:58 +02:00
mach-imx Merge branch 'for-rmk' of git://git.pengutronix.de/git/imx/linux-2.6 into devel-stable 2011-03-28 18:52:44 +01:00
mach-integrator Merge branches 'fixes', 'pgt-next' and 'versatile' into devel 2011-03-20 09:32:12 +00:00
mach-iop13xx arm: Cleanup the irq namespace 2011-03-29 14:47:57 +02:00
mach-iop32x arm: Fold irq_set_chip/irq_set_handler 2011-03-29 14:47:58 +02:00
mach-iop33x arm: Fold irq_set_chip/irq_set_handler 2011-03-29 14:47:58 +02:00
mach-ixp4xx arm: Fold irq_set_chip/irq_set_handler 2011-03-29 14:47:58 +02:00
mach-ixp23xx arm: Fold irq_set_chip/irq_set_handler 2011-03-29 14:47:58 +02:00
mach-ixp2000 arm: Fold irq_set_chip/irq_set_handler 2011-03-29 14:47:58 +02:00
mach-kirkwood Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm 2011-03-30 07:50:45 -07:00
mach-ks8695 arm: Fold irq_set_chip/irq_set_handler 2011-03-29 14:47:58 +02:00
mach-l7200/include/mach
mach-loki Merge branch 'devel-stable' of master.kernel.org:/home/rmk/linux-2.6-arm 2011-03-17 19:08:06 -07:00
mach-lpc32xx arm: Fold irq_set_chip/irq_set_handler 2011-03-29 14:47:58 +02:00
mach-mmp arm: Fold irq_set_chip/irq_set_handler 2011-03-29 14:47:58 +02:00
mach-msm arm: Fold irq_set_chip/irq_set_handler 2011-03-29 14:47:58 +02:00
mach-mv78xx0 arm: Cleanup the irq namespace 2011-03-29 14:47:57 +02:00
mach-mx3 Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm 2011-03-30 07:50:45 -07:00
mach-mx5 Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm 2011-03-30 07:50:45 -07:00
mach-mxc91231 ARM: mxc91231/iomux: allow pin_list to be const 2011-03-07 19:29:28 +01:00
mach-mxs Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm 2011-03-30 07:50:45 -07:00
mach-netx arm: Fold irq_set_chip/irq_set_handler 2011-03-29 14:47:58 +02:00
mach-nomadik ARM: P2V: separate PHYS_OFFSET from platform definitions 2011-02-17 23:26:55 +00:00
mach-ns9xxx arm: Fold irq_set_chip/irq_set_handler 2011-03-29 14:47:58 +02:00
mach-nuc93x arm: Fold irq_set_chip/irq_set_handler 2011-03-29 14:47:58 +02:00
mach-omap1 arm: Fold irq_set_chip/irq_set_handler 2011-03-29 14:47:58 +02:00
mach-omap2 arm: Fold irq_set_chip/irq_set_handler 2011-03-29 14:47:58 +02:00
mach-orion5x Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm 2011-03-30 07:50:45 -07:00
mach-pnx4008 arm: Cleanup the irq namespace 2011-03-29 14:47:57 +02:00
mach-pxa Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm 2011-03-30 07:50:45 -07:00
mach-realview ARM: 6807/1: realview: Fix secondary GIC initialisation for EB with MPCore tile 2011-03-26 10:06:08 +00:00
mach-rpc arm: Fold irq_set_chip/irq_set_handler 2011-03-29 14:47:58 +02:00
mach-s3c24a0/include/mach ARM: P2V: separate PHYS_OFFSET from platform definitions 2011-02-17 23:26:55 +00:00
mach-s3c64xx arm: Fold irq_set_chip/irq_set_handler 2011-03-29 14:47:58 +02:00
mach-s3c2400 ARM: P2V: separate PHYS_OFFSET from platform definitions 2011-02-17 23:26:55 +00:00
mach-s3c2410 arm: Fold irq_set_chip/irq_set_handler 2011-03-29 14:47:58 +02:00
mach-s3c2412 arm: Fold irq_set_chip/irq_set_handler 2011-03-29 14:47:58 +02:00
mach-s3c2416 arm: Fold irq_set_chip/irq_set_handler 2011-03-29 14:47:58 +02:00
mach-s3c2440 arm: Fold irq_set_chip/irq_set_handler 2011-03-29 14:47:58 +02:00
mach-s3c2443 arm: Fold irq_set_chip/irq_set_handler 2011-03-29 14:47:58 +02:00
mach-s5p64x0 ARM: S5P64X0: Fix iodesc array size for S5P6450 2011-03-28 16:17:53 +09:00
mach-s5p6442 Merge branch 'p2v' into devel 2011-03-16 23:35:27 +00:00
mach-s5pc100 Merge branch 'devel-stable' of master.kernel.org:/home/rmk/linux-2.6-arm 2011-03-17 19:08:06 -07:00
mach-s5pv210 ARM: S5PV210: Remove duplicated inclusion 2011-03-28 16:17:53 +09:00
mach-sa1100 arm: Fold irq_set_chip/irq_set_handler 2011-03-29 14:47:58 +02:00
mach-shark arm: Fold irq_set_chip/irq_set_handler 2011-03-29 14:47:58 +02:00
mach-shmobile Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc 2011-03-29 12:09:30 -07:00
mach-spear3xx ARM: 6794/1: SPEAr: Append UL to device address macros. 2011-03-09 09:50:04 +00:00
mach-spear6xx ARM: 6794/1: SPEAr: Append UL to device address macros. 2011-03-09 09:50:04 +00:00
mach-stmp37xx ARM: stmp37xx: irq_data conversion. 2011-01-13 17:19:02 +01:00
mach-stmp378x ARM: stmp378x: irq_data conversion. 2011-01-13 17:19:01 +01:00
mach-tcc8k arm: Cleanup the irq namespace 2011-03-29 14:47:57 +02:00
mach-tegra arm: Fold irq_set_chip/irq_set_handler 2011-03-29 14:47:58 +02:00
mach-u300 Merge branch 'devel-stable' of master.kernel.org:/home/rmk/linux-2.6-arm 2011-03-17 19:08:06 -07:00
mach-ux500 arm: Fold irq_set_chip/irq_set_handler 2011-03-29 14:47:58 +02:00
mach-versatile arm: versatile : Fix typo introduced in irq namespace cleanup 2011-03-30 12:02:15 +02:00
mach-vexpress ARM: 6771/1: vexpress: add support for multiple core tiles 2011-03-20 09:32:21 +00:00
mach-vt8500 arm: Fold irq_set_chip/irq_set_handler 2011-03-29 14:47:58 +02:00
mach-w90x900 arm: Fold irq_set_chip/irq_set_handler 2011-03-29 14:47:58 +02:00
mm ARM: Make consolidated PM sleep code depend on PM_SLEEP 2011-04-02 10:08:55 +01:00
nwfpe
oprofile Merge branch 'perf-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip 2011-02-15 10:18:48 -08:00
plat-iop Merge branch 'clksrc' into devel 2011-01-05 18:09:03 +00:00
plat-mxc Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm 2011-03-30 07:50:45 -07:00
plat-nomadik arm: Fold irq_set_chip/irq_set_handler 2011-03-29 14:47:58 +02:00
plat-omap arm: Cleanup the irq namespace 2011-03-29 14:47:57 +02:00
plat-orion arm: Fold irq_set_chip/irq_set_handler 2011-03-29 14:47:58 +02:00
plat-pxa arm: Fold irq_set_chip/irq_set_handler 2011-03-29 14:47:58 +02:00
plat-s3c24xx arm: Fold irq_set_chip/irq_set_handler 2011-03-29 14:47:58 +02:00
plat-s5p arm: Fold irq_set_chip/irq_set_handler 2011-03-29 14:47:58 +02:00
plat-samsung arm: Fold irq_set_chip/irq_set_handler 2011-03-29 14:47:58 +02:00
plat-spear arm: Fold irq_set_chip/irq_set_handler 2011-03-29 14:47:58 +02:00
plat-stmp3xxx arm: Fold irq_set_chip/irq_set_handler 2011-03-29 14:47:58 +02:00
plat-tcc ARM: P2V: separate PHYS_OFFSET from platform definitions 2011-02-17 23:26:55 +00:00
plat-versatile arm: Fold irq_set_chip/irq_set_handler 2011-03-29 14:47:58 +02:00
tools ARM: Update (and cut down) mach-types 2011-03-20 18:07:44 +00:00
vfp Merge branch 'trivial' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6 2011-03-20 18:14:55 -07:00
Kconfig Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm 2011-03-30 07:50:45 -07:00
Kconfig-nommu
Kconfig.debug Merge branch 'misc' into devel 2011-01-06 22:32:52 +00:00
Makefile Merge branch 'devel-stable' of master.kernel.org:/home/rmk/linux-2.6-arm 2011-03-17 19:08:06 -07:00