git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'drm-reorg' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied...
[safe/jmp/linux-2.6]
/
drivers
/
acpi
/
glue.c
diff --git
a/drivers/acpi/glue.c
b/drivers/acpi/glue.c
index
2808dc6
..
9b227d4
100644
(file)
--- a/
drivers/acpi/glue.c
+++ b/
drivers/acpi/glue.c
@@
-333,6
+333,9
@@
static int __init acpi_rtc_init(void)
{
struct device *dev = get_rtc_dev();
+ if (acpi_disabled)
+ return 0;
+
if (dev) {
rtc_wake_setup();
rtc_info.wake_on = rtc_wake_on;