diff options
| author | Len Brown <len.brown@intel.com> | 2007-04-28 23:12:03 -0400 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2007-04-28 23:12:03 -0400 |
| commit | fb16596997ded3e70d308bec58e32c1e2c5cf9b0 (patch) | |
| tree | 28939b49c26e51d2c22047ef2e07f4b1d6352bbb /drivers/clocksource/acpi_pm.c | |
| parent | f188291aec9b17ef7cec01db66b9cdb6fae26372 (diff) | |
| parent | afd3810d9b6b0d446a34e1d4e94f0cc020b00a14 (diff) | |
Pull misc-for-upstream into release branch
Diffstat (limited to 'drivers/clocksource/acpi_pm.c')
| -rw-r--r-- | drivers/clocksource/acpi_pm.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/clocksource/acpi_pm.c b/drivers/clocksource/acpi_pm.c index 5ac309ee7f05..5cfcff532545 100644 --- a/drivers/clocksource/acpi_pm.c +++ b/drivers/clocksource/acpi_pm.c | |||
| @@ -26,7 +26,7 @@ | |||
| 26 | /* | 26 | /* |
| 27 | * The I/O port the PMTMR resides at. | 27 | * The I/O port the PMTMR resides at. |
| 28 | * The location is detected during setup_arch(), | 28 | * The location is detected during setup_arch(), |
| 29 | * in arch/i386/acpi/boot.c | 29 | * in arch/i386/kernel/acpi/boot.c |
| 30 | */ | 30 | */ |
| 31 | u32 pmtmr_ioport __read_mostly; | 31 | u32 pmtmr_ioport __read_mostly; |
| 32 | 32 | ||