Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 94095
b: refs/heads/master
c: d83fd8a
h: refs/heads/master
i:
  94093: 73c6a40
  94091: 471687f
  94087: d0ed07a
  94079: 1cfee4f
v: v3
  • Loading branch information
Andrew Morton authored and Linus Torvalds committed Apr 28, 2008
1 parent 0656a7d commit 49b0b7f
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 3 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 6e10efefaae45989f2f143bacfef75af55068378
refs/heads/master: d83fd8a26769c75d51a6b05d8dcb3e36302dd8ba
2 changes: 0 additions & 2 deletions trunk/drivers/acpi/thermal.c
Original file line number Diff line number Diff line change
Expand Up @@ -1710,7 +1710,6 @@ static int acpi_thermal_resume(struct acpi_device *device)
return AE_OK;
}

#ifdef CONFIG_DMI
static int thermal_act(const struct dmi_system_id *d) {

if (act == 0) {
Expand Down Expand Up @@ -1785,7 +1784,6 @@ static struct dmi_system_id thermal_dmi_table[] __initdata = {
},
{}
};
#endif /* CONFIG_DMI */

static int __init acpi_thermal_init(void)
{
Expand Down

0 comments on commit 49b0b7f

Please sign in to comment.