diff options
Diffstat (limited to 'drivers/acpi')
-rw-r--r-- | drivers/acpi/battery.c | 6 | ||||
-rw-r--r-- | drivers/acpi/battery.h | 10 | ||||
-rw-r--r-- | drivers/acpi/sbs.c | 2 |
3 files changed, 13 insertions, 5 deletions
diff --git a/drivers/acpi/battery.c b/drivers/acpi/battery.c index 797a6938d051..bfec70f12faa 100644 --- a/drivers/acpi/battery.c +++ b/drivers/acpi/battery.c | |||
@@ -39,15 +39,13 @@ | |||
39 | #include <linux/acpi.h> | 39 | #include <linux/acpi.h> |
40 | #include <linux/power_supply.h> | 40 | #include <linux/power_supply.h> |
41 | 41 | ||
42 | #include "battery.h" | ||
43 | |||
42 | #define PREFIX "ACPI: " | 44 | #define PREFIX "ACPI: " |
43 | 45 | ||
44 | #define ACPI_BATTERY_VALUE_UNKNOWN 0xFFFFFFFF | 46 | #define ACPI_BATTERY_VALUE_UNKNOWN 0xFFFFFFFF |
45 | 47 | ||
46 | #define ACPI_BATTERY_CLASS "battery" | ||
47 | #define ACPI_BATTERY_DEVICE_NAME "Battery" | 48 | #define ACPI_BATTERY_DEVICE_NAME "Battery" |
48 | #define ACPI_BATTERY_NOTIFY_STATUS 0x80 | ||
49 | #define ACPI_BATTERY_NOTIFY_INFO 0x81 | ||
50 | #define ACPI_BATTERY_NOTIFY_THRESHOLD 0x82 | ||
51 | 49 | ||
52 | /* Battery power unit: 0 means mW, 1 means mA */ | 50 | /* Battery power unit: 0 means mW, 1 means mA */ |
53 | #define ACPI_BATTERY_POWER_UNIT_MA 1 | 51 | #define ACPI_BATTERY_POWER_UNIT_MA 1 |
diff --git a/drivers/acpi/battery.h b/drivers/acpi/battery.h new file mode 100644 index 000000000000..6c084976987d --- /dev/null +++ b/drivers/acpi/battery.h | |||
@@ -0,0 +1,10 @@ | |||
1 | #ifndef __ACPI_BATTERY_H | ||
2 | #define __ACPI_BATTERY_H | ||
3 | |||
4 | #define ACPI_BATTERY_CLASS "battery" | ||
5 | |||
6 | #define ACPI_BATTERY_NOTIFY_STATUS 0x80 | ||
7 | #define ACPI_BATTERY_NOTIFY_INFO 0x81 | ||
8 | #define ACPI_BATTERY_NOTIFY_THRESHOLD 0x82 | ||
9 | |||
10 | #endif | ||
diff --git a/drivers/acpi/sbs.c b/drivers/acpi/sbs.c index dbd48498b938..366ca40a6f70 100644 --- a/drivers/acpi/sbs.c +++ b/drivers/acpi/sbs.c | |||
@@ -37,12 +37,12 @@ | |||
37 | #include <linux/power_supply.h> | 37 | #include <linux/power_supply.h> |
38 | 38 | ||
39 | #include "sbshc.h" | 39 | #include "sbshc.h" |
40 | #include "battery.h" | ||
40 | 41 | ||
41 | #define PREFIX "ACPI: " | 42 | #define PREFIX "ACPI: " |
42 | 43 | ||
43 | #define ACPI_SBS_CLASS "sbs" | 44 | #define ACPI_SBS_CLASS "sbs" |
44 | #define ACPI_AC_CLASS "ac_adapter" | 45 | #define ACPI_AC_CLASS "ac_adapter" |
45 | #define ACPI_BATTERY_CLASS "battery" | ||
46 | #define ACPI_SBS_DEVICE_NAME "Smart Battery System" | 46 | #define ACPI_SBS_DEVICE_NAME "Smart Battery System" |
47 | #define ACPI_SBS_FILE_INFO "info" | 47 | #define ACPI_SBS_FILE_INFO "info" |
48 | #define ACPI_SBS_FILE_STATE "state" | 48 | #define ACPI_SBS_FILE_STATE "state" |