git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux...
[pandora-kernel.git]
/
drivers
/
acpi
/
container.c
diff --git
a/drivers/acpi/container.c
b/drivers/acpi/container.c
index
0930d94
..
3c25ec7
100644
(file)
--- a/
drivers/acpi/container.c
+++ b/
drivers/acpi/container.c
@@
-49,15
+49,21
@@
MODULE_AUTHOR("Anil S Keshavamurthy");
MODULE_DESCRIPTION("ACPI container driver");
MODULE_LICENSE("GPL");
MODULE_DESCRIPTION("ACPI container driver");
MODULE_LICENSE("GPL");
-#define ACPI_STA_PRESENT (0x00000001)
-
static int acpi_container_add(struct acpi_device *device);
static int acpi_container_remove(struct acpi_device *device, int type);
static int acpi_container_add(struct acpi_device *device);
static int acpi_container_remove(struct acpi_device *device, int type);
+static const struct acpi_device_id container_device_ids[] = {
+ {"ACPI0004", 0},
+ {"PNP0A05", 0},
+ {"PNP0A06", 0},
+ {"", 0},
+};
+MODULE_DEVICE_TABLE(acpi, container_device_ids);
+
static struct acpi_driver acpi_container_driver = {
.name = "container",
.class = ACPI_CONTAINER_CLASS,
static struct acpi_driver acpi_container_driver = {
.name = "container",
.class = ACPI_CONTAINER_CLASS,
- .ids =
"ACPI0004,PNP0A05,PNP0A06"
,
+ .ids =
container_device_ids
,
.ops = {
.add = acpi_container_add,
.remove = acpi_container_remove,
.ops = {
.add = acpi_container_add,
.remove = acpi_container_remove,
@@
-75,13
+81,13
@@
static int is_device_present(acpi_handle handle)
status = acpi_get_handle(handle, "_STA", &temp);
if (ACPI_FAILURE(status))
status = acpi_get_handle(handle, "_STA", &temp);
if (ACPI_FAILURE(status))
- return 1; /* _STA not found, ass
mu
e device present */
+ return 1; /* _STA not found, ass
um
e device present */
status = acpi_evaluate_integer(handle, "_STA", NULL, &sta);
if (ACPI_FAILURE(status))
return 0; /* Firmware error */
status = acpi_evaluate_integer(handle, "_STA", NULL, &sta);
if (ACPI_FAILURE(status))
return 0; /* Firmware error */
- return ((sta & ACPI_STA_
PRESENT) == ACPI_STA
_PRESENT);
+ return ((sta & ACPI_STA_
DEVICE_PRESENT) == ACPI_STA_DEVICE
_PRESENT);
}
/*******************************************************************/
}
/*******************************************************************/