mirrors/linux
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2025-12-28 07:54:36 -05:00
Code Issues Packages Projects Releases Wiki Activity
Files
e2c7617ae36b27f97643bfa08aabe27e630c1a76
linux/drivers
History
Daniel Glöckner a882b14fe8 rtc-cmos: fix wakeup from S5 without CONFIG_PM_SLEEP 
Commit b5ada4600d ("drivers/rtc/rtc-cmos.c: fix compilation warning
when !CONFIG_PM_SLEEP") broke wakeup from S5 by making cmos_poweroff a
nop unless CONFIG_PM_SLEEP was defined.

Fix this by restricting the #ifdef to cmos_resume and restoring the old
dependency on CONFIG_PM for cmos_suspend and cmos_poweroff.

Signed-off-by: Daniel Glöckner <daniel-gl@gmx.net>
Cc: Mika Westerberg <mika.westerberg@linux.intel.com>
Cc: Alessandro Zummo <a.zummo@towertech.it>
Cc: <stable@vger.kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2014-10-14 02:18:19 +02:00
..
accessibility
…
acpi
Merge tag 'pm+acpi-3.18-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm
2014-10-09 16:07:43 -04:00
amba
PM / Domains: Move dev_pm_domain_attach|detach() to pm_domain.h
2014-09-30 01:16:44 +02:00
ata
Merge branch 'for-3.18' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/libata
2014-10-10 07:23:11 -04:00
atm
…
auxdisplay
…
base
drivers: dma-contiguous: add initialization from device tree
2014-10-14 02:18:12 +02:00
bcma
Merge tag 'gpio-v3.18-1' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-gpio
2014-10-09 14:58:15 -04:00
block
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
2014-10-13 11:28:42 +02:00
bluetooth
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
2014-10-13 11:28:42 +02:00
bus
Merge tag 'drivers-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
2014-10-08 17:37:16 -04:00
cdrom
…
char
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
2014-10-13 11:28:42 +02:00
clk
clk: RK808: add clkout driver for RK808
2014-10-14 02:18:18 +02:00
clocksource
Merge branch 'timers-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
2014-10-09 06:35:05 -04:00
connector
…
cpufreq
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mpe/linux
2014-10-11 20:34:00 -04:00
cpuidle
Merge branch 'sched-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
2014-10-13 16:23:15 +02:00
crypto
Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
2014-10-08 06:44:48 -04:00
dca
…
devfreq
PM / devfreq: exynos: Enable building exynos PPMU as module
2014-09-29 20:22:36 +09:00
dio
…
dma
Merge tag 'dmaengine-3.17' of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/dmaengine
2014-10-07 20:39:25 -04:00
dma-buf
dma-buf: don't open-code atomic_long_read()
2014-10-09 02:39:07 -04:00
edac
Merge tag 'edac/v3.18-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-edac
2014-10-10 22:07:55 -04:00
eisa
…
extcon
…
firewire
…
firmware
drivers/firmware/memmap.c: don't create memmap sysfs of same firmware_map_entry
2014-10-09 22:26:00 -04:00
fmc
…
gpio
Merge tag 'gpio-v3.18-1' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-gpio
2014-10-09 14:58:15 -04:00
gpu
Merge branch 'sched-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
2014-10-13 16:23:15 +02:00
hid
Merge tag 'gpio-v3.18-1' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-gpio
2014-10-09 14:58:15 -04:00
hsi
…
hv
…
hwmon
hwmon: (ab8500) Call kernel_power_off instead of pm_power_off
2014-10-03 08:19:02 -07:00
hwspinlock
…
i2c
Merge tag 'pm+acpi-3.18-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm
2014-10-09 16:07:43 -04:00
ide
…
idle
…
iio
…
infiniband
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
2014-10-13 11:28:42 +02:00
input
Merge tag 'stable/for-linus-3.18-rc0-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip
2014-10-11 20:29:01 -04:00
iommu
Merge tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm
2014-10-08 05:27:39 -04:00
ipack
…
irqchip
Merge tag 'pci-v3.18-changes' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci
2014-10-09 15:03:49 -04:00
isdn
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next
2014-10-08 21:40:54 -04:00
leds
Merge tag 'hwmon-for-linus-v3.18' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging
2014-10-10 16:40:14 -04:00
lguest
…
macintosh
powerpc: Move via-cuda symbol exports next to function definitions
2014-09-25 23:14:37 +10:00
mailbox
…
mcb
…
md
Merge branch 'sched-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
2014-10-13 16:23:15 +02:00
media
Merge tag 'media/v3.18-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media
2014-10-10 22:04:49 -04:00
memory
…
memstick
…
message
Merge tag 'scsi-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi
2014-10-07 21:29:18 -04:00
mfd
Merge tag 'hwmon-for-linus-v3.18' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging
2014-10-10 16:40:14 -04:00
misc
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
2014-10-13 11:28:42 +02:00
mmc
Merge tag 'mmc-v3.18-1' of git://git.linaro.org/people/ulf.hansson/mmc
2014-10-11 06:34:22 -04:00
mtd
…
net
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
2014-10-13 11:28:42 +02:00
nfc
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless
2014-10-07 14:48:29 -04:00
ntb
…
nubus
…
of
Merge tag 'devicetree-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/glikely/linux
2014-10-11 06:47:50 -04:00
oprofile
…
parisc
Merge branch 'sched-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
2014-10-13 16:23:15 +02:00
parport
…
pci
Merge tag 'stable/for-linus-3.18-rc0-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip
2014-10-11 20:29:01 -04:00
pcmcia
…
phy
…
pinctrl
Merge tag 'gpio-v3.18-1' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-gpio
2014-10-09 14:58:15 -04:00
platform
Merge tag 'platform-drivers-x86-v3.18-1' of git://git.infradead.org/users/dvhart/linux-platform-drivers-x86
2014-10-12 09:30:38 -04:00
pnp
…
power
Merge tag 'restart-handler-for-v3.18' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging
2014-10-10 16:38:02 -04:00
powercap
…
pps
…
ps3
…
ptp
…
pwm
…
rapidio
…
ras
…
regulator
Merge remote-tracking branches 'regulator/topic/tps65217', 'regulator/topic/tps65910' and 'regulator/topic/voltage-ev' into regulator-next
2014-09-30 13:50:31 +01:00
remoteproc
…
reset
…
rpmsg
…
rtc
rtc-cmos: fix wakeup from S5 without CONFIG_PM_SLEEP
2014-10-14 02:18:19 +02:00
s390
Merge branch 'sched-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
2014-10-13 16:23:15 +02:00
sbus
…
scsi
Merge branch 'sched-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
2014-10-13 16:23:15 +02:00
sfi
…
sh
…
sn
…
soc
Merge tag 'drivers-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
2014-10-08 17:37:16 -04:00
spi
Merge tag 'pm+acpi-3.18-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm
2014-10-09 16:07:43 -04:00
spmi
…
ssb
Merge tag 'gpio-v3.18-1' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-gpio
2014-10-09 14:58:15 -04:00
staging
Merge branch 'sched-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
2014-10-13 16:23:15 +02:00
target
…
tc
…
thermal
…
thunderbolt
…
tty
Merge branch 'sched-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
2014-10-13 16:23:15 +02:00
uio
…
usb
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
2014-10-13 11:28:42 +02:00
uwb
…
vfio
Merge tag 'vfio-v3.18-rc1' of git://github.com/awilliam/linux-vfio
2014-10-11 06:49:24 -04:00
vhost
…
video
Merge tag 'stable/for-linus-3.18-rc0-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip
2014-10-11 20:29:01 -04:00
virt
…
virtio
mm/balloon_compaction: add vmstat counters and kpageflags bit
2014-10-09 22:26:01 -04:00
vlynq
…
vme
…
w1
…
watchdog
Merge tag 'hwmon-for-linus-v3.18' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging
2014-10-10 16:40:14 -04:00
xen
Merge tag 'stable/for-linus-3.18-rc0-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip
2014-10-11 20:29:01 -04:00
zorro
…
Kconfig
…
Makefile
…