X-Git-Url: http://ftp.safe.ca/?a=blobdiff_plain;f=drivers%2Facpi%2Fsbs.c;h=62bef0b3b614aef8d10742cd3494e9ecca149675;hb=6658d3a7bbfd1768a7b599def47939417f0ee8ef;hp=db7b350a50356417f49bf660a1a9e1e74ccbfaa7;hpb=635227ee89929a6e2920fc8aa1cd48f7225d3d93;p=safe%2Fjmp%2Flinux-2.6

diff --git a/drivers/acpi/sbs.c b/drivers/acpi/sbs.c
index db7b350..62bef0b 100644
--- a/drivers/acpi/sbs.c
+++ b/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