Merge groveronline.com:/root/bk/linux-2.5

into groveronline.com:/root/bk/linux-acpi

Merge groveronline.com:/root/bk/linux-2.5
into groveronline.com:/root/bk/linux-acpi
f050a5c4 · Andy Grover · 4c17e91a · 83549bf9 · f050a5c4 · f050a5c4
Commit f050a5c4 authored Jun 10, 2003 by Andy Grover
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

drivers/acpi/tables.c drivers/acpi/tables.c +1 -1

drivers/acpi/thermal.c drivers/acpi/thermal.c +1 -1

No files found.
--- a/drivers/acpi/tables.c
+++ b/drivers/acpi/tables.c
@@ -56,7 +56,7 @@ static char *acpi_table_signatures[ACPI_TABLE_COUNT] = {
 	[ACPI_SRAT]		= "SRAT",
 	[ACPI_SSDT]		= "SSDT",
 	[ACPI_SPMI]		= "SPMI",
-	[ACPI_HPET]		= "HPET"
+	[ACPI_HPET]		= "HPET",
 };

 /* System Description Table (RSDT/XSDT) */

--- a/drivers/acpi/thermal.c
+++ b/drivers/acpi/thermal.c
@@ -430,7 +430,7 @@ acpi_thermal_call_usermode (
 	ACPI_FUNCTION_TRACE("acpi_thermal_call_usermode");

 	if (!path)
-		return_VALUE(-EINVAL);;
+		return_VALUE(-EINVAL);

 	argv[0] = path;