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) | |
download | kernel-crypto-fb16596997ded3e70d308bec58e32c1e2c5cf9b0.tar.gz kernel-crypto-fb16596997ded3e70d308bec58e32c1e2c5cf9b0.tar.xz kernel-crypto-fb16596997ded3e70d308bec58e32c1e2c5cf9b0.zip |
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 5ac309ee7f0..5cfcff53254 100644 --- a/drivers/clocksource/acpi_pm.c +++ b/drivers/clocksource/acpi_pm.c @@ -26,7 +26,7 @@ /* * The I/O port the PMTMR resides at. * The location is detected during setup_arch(), - * in arch/i386/acpi/boot.c + * in arch/i386/kernel/acpi/boot.c */ u32 pmtmr_ioport __read_mostly; |