diff options
| author | Len Brown <len.brown@intel.com> | 2007-02-03 01:14:35 -0500 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2007-02-03 01:14:35 -0500 |
| commit | 975a8e3ed2b9eab9f062a1e0ba7fe180e15204e1 (patch) | |
| tree | 59b654df0b066b6d6b8ea16f5ae581b8fb45c1d5 /drivers/acpi/bus.c | |
| parent | 1fcb71b84b05ff3bfd5b5b2eca9a9b3d13a76e3a (diff) | |
| parent | bfd80223d73f80e1d1c69dace9151756b3ef3b49 (diff) | |
| download | talos-op-linux-975a8e3ed2b9eab9f062a1e0ba7fe180e15204e1.tar.gz talos-op-linux-975a8e3ed2b9eab9f062a1e0ba7fe180e15204e1.zip | |
Pull sysfs into test branch
Conflicts:
Documentation/feature-removal-schedule.txt
include/acpi/acpi_drivers.h
Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'drivers/acpi/bus.c')
| -rw-r--r-- | drivers/acpi/bus.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/acpi/bus.c b/drivers/acpi/bus.c index 15d677e6cee9..c26468da4295 100644 --- a/drivers/acpi/bus.c +++ b/drivers/acpi/bus.c @@ -192,7 +192,7 @@ int acpi_bus_set_power(acpi_handle handle, int state) if (!device->flags.power_manageable) { ACPI_DEBUG_PRINT((ACPI_DB_INFO, "Device `[%s]' is not power manageable\n", - device->kobj.name)); + device->dev.kobj.name)); return -ENODEV; } /* |
