]> err.no Git - linux-2.6/commitdiff
ACPI: skip smart battery init when acpi=off
authorLen Brown <len.brown@intel.com>
Wed, 16 Aug 2006 03:21:37 +0000 (23:21 -0400)
committerLen Brown <len.brown@intel.com>
Wed, 16 Aug 2006 03:21:37 +0000 (23:21 -0400)
Signed-off-by: Len Brown <len.brown@intel.com>
drivers/acpi/sbs.c

index db7b350a50356417f49bf660a1a9e1e74ccbfaa7..62bef0b3b614aef8d10742cd3494e9ecca149675 100644 (file)
@@ -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