aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHenrique de Moraes Holschuh <hmh@hmh.eng.br>2008-01-08 10:02:54 -0500
committerLen Brown <len.brown@intel.com>2008-02-01 22:26:08 -0500
commit013c40e457ac573b29daa0e369c2ba6729c23557 (patch)
tree629ced5981a53fb2738e916ddd977962b22f6384
parentd1edb2b5f1d016d679600cccf2716e0134fff917 (diff)
ACPI: thinkpad-acpi: silence _sta warning
When both CONFIG_THINKPAD_ACPI_DOCK and CONFIG_THINKPAD_ACPI_BAY are undefined, _sta is not used and that causes a gcc warning. Fix it (and I think this is a regression, I am pretty sure I fixed this once before, sorry about that). Issue reported by: Pritt Laes. Signed-off-by: Henrique de Moraes Holschuh <hmh@hmh.eng.br> Cc: Pritt Laes <plaes@plaes.org> Signed-off-by: Len Brown <len.brown@intel.com>
-rw-r--r--drivers/misc/thinkpad_acpi.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/misc/thinkpad_acpi.c b/drivers/misc/thinkpad_acpi.c
index 049ec42c77be..e18f1e18781f 100644
--- a/drivers/misc/thinkpad_acpi.c
+++ b/drivers/misc/thinkpad_acpi.c
@@ -414,6 +414,7 @@ static int acpi_ec_write(int i, u8 v)
414 return 1; 414 return 1;
415} 415}
416 416
417#if defined(CONFIG_THINKPAD_ACPI_DOCK) || defined(CONFIG_THINKPAD_ACPI_BAY)
417static int _sta(acpi_handle handle) 418static int _sta(acpi_handle handle)
418{ 419{
419 int status; 420 int status;
@@ -423,6 +424,7 @@ static int _sta(acpi_handle handle)
423 424
424 return status; 425 return status;
425} 426}
427#endif
426 428
427static int issue_thinkpad_cmos_command(int cmos_cmd) 429static int issue_thinkpad_cmos_command(int cmos_cmd)
428{ 430{