diff options
| author | Grant Likely <grant.likely@secretlab.ca> | 2010-12-22 02:10:01 -0500 |
|---|---|---|
| committer | Grant Likely <grant.likely@secretlab.ca> | 2010-12-22 02:10:01 -0500 |
| commit | 752a4a95e3c96a8e8d3405b16d292f13e8c7856b (patch) | |
| tree | 838e43696fdc45b83f082eef7230d79cfe699497 /drivers/platform/x86/thinkpad_acpi.c | |
| parent | bc3f67a3e1b20756d4bfa5886a6b8fd0c068e6a4 (diff) | |
| parent | 90a8a73c06cc32b609a880d48449d7083327e11a (diff) | |
Merge commit 'v2.6.37-rc7' into spi/next
Diffstat (limited to 'drivers/platform/x86/thinkpad_acpi.c')
| -rw-r--r-- | drivers/platform/x86/thinkpad_acpi.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/platform/x86/thinkpad_acpi.c b/drivers/platform/x86/thinkpad_acpi.c index 2d61186ad5a2..e8c21994b36d 100644 --- a/drivers/platform/x86/thinkpad_acpi.c +++ b/drivers/platform/x86/thinkpad_acpi.c | |||
| @@ -8497,7 +8497,6 @@ static void ibm_exit(struct ibm_struct *ibm) | |||
| 8497 | ibm->acpi->type, | 8497 | ibm->acpi->type, |
| 8498 | dispatch_acpi_notify); | 8498 | dispatch_acpi_notify); |
| 8499 | ibm->flags.acpi_notify_installed = 0; | 8499 | ibm->flags.acpi_notify_installed = 0; |
| 8500 | ibm->flags.acpi_notify_installed = 0; | ||
| 8501 | } | 8500 | } |
| 8502 | 8501 | ||
| 8503 | if (ibm->flags.proc_created) { | 8502 | if (ibm->flags.proc_created) { |