diff options
author | 2007-02-03 01:14:35 -0500 | |
---|---|---|
committer | 2007-02-03 01:14:35 -0500 | |
commit | 975a8e3ed2b9eab9f062a1e0ba7fe180e15204e1 (patch) | |
tree | 59b654df0b066b6d6b8ea16f5ae581b8fb45c1d5 /drivers/acpi/thermal.c | |
parent | Pull bay into test branch (diff) | |
parent | ACPI: correct id for fixed buttons (diff) | |
download | linux-975a8e3ed2b9eab9f062a1e0ba7fe180e15204e1.tar.gz linux-975a8e3ed2b9eab9f062a1e0ba7fe180e15204e1.tar.bz2 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/thermal.c')
-rw-r--r-- | drivers/acpi/thermal.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/acpi/thermal.c b/drivers/acpi/thermal.c index 40ddb4dd9631..f76d3168c2b2 100644 --- a/drivers/acpi/thermal.c +++ b/drivers/acpi/thermal.c @@ -82,7 +82,7 @@ MODULE_PARM_DESC(tzp, "Thermal zone polling frequency, in 1/10 seconds.\n"); static int acpi_thermal_add(struct acpi_device *device); static int acpi_thermal_remove(struct acpi_device *device, int type); -static int acpi_thermal_resume(struct acpi_device *device, int state); +static int acpi_thermal_resume(struct acpi_device *device); static int acpi_thermal_state_open_fs(struct inode *inode, struct file *file); static int acpi_thermal_temp_open_fs(struct inode *inode, struct file *file); static int acpi_thermal_trip_open_fs(struct inode *inode, struct file *file); @@ -1353,7 +1353,7 @@ static int acpi_thermal_remove(struct acpi_device *device, int type) return 0; } -static int acpi_thermal_resume(struct acpi_device *device, int state) +static int acpi_thermal_resume(struct acpi_device *device) { struct acpi_thermal *tz = NULL; int i; |