From 704fe018955d9854d11d86905bdc601b769781b4 Mon Sep 17 00:00:00 2001
From: Len Brown <len.brown@intel.com>
Date: Tue, 15 Aug 2006 23:21:37 -0400
Subject: [PATCH] --- yaml --- r: 33418 b: refs/heads/master c:
 b20d2aeb0ad322cbe7fd9120acae6118231b17a3 h: refs/heads/master v: v3

---
 [refs]                   | 2 +-
 trunk/drivers/acpi/sbs.c | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 9fbb654a3592..8512a29b7f1b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4d8316d5ea4dcf0bf15d8a06d539ed7c99e9cfbe
+refs/heads/master: b20d2aeb0ad322cbe7fd9120acae6118231b17a3
diff --git a/trunk/drivers/acpi/sbs.c b/trunk/drivers/acpi/sbs.c
index db7b350a5035..62bef0b3b614 100644
--- a/trunk/drivers/acpi/sbs.c
+++ b/trunk/drivers/acpi/sbs.c
@@ -1714,6 +1714,9 @@ static int __init acpi_sbs_init(void)
 {
 	int result = 0;
 
+	if (acpi_disabled)
+		return -ENODEV;
+
 	init_MUTEX(&sbs_sem);
 
 	if (capacity_mode != DEF_CAPACITY_UNIT