diff options
author | Bjorn Helgaas <bjorn.helgaas@hp.com> | 2008-12-01 17:18:12 -0500 |
---|---|---|
committer | Thomas Gleixner <tglx@linutronix.de> | 2008-12-12 09:05:28 -0500 |
commit | 0a57b783018a77ca16097198844438bdff4d012e (patch) | |
tree | 099a0e6c1fdb1c4da74b8c5af8b6b003096c70bd /drivers/clocksource | |
parent | 6c34bc2976b30dc8b56392c020e25bae1f363cab (diff) |
clocksource, acpi_pm.c: put acpi_pm_read_slow() under CONFIG_PCI
acpi_pm_read_slow() is only used when CONFIG_PCI=y, so move the definition
inside the ifdef.
Otherwise this causes a "defined but not used" warning when building with
CONFIG_ACPI=y and CONFIG_PCI=n (that's not supported yet, but it could
be).
Signed-off-by: Bjorn Helgaas <bjorn.helgaas@hp.com>
Cc: mingo@elte.hu
Cc: johnstul@us.ibm.com
Cc: akpm@linux-foundation.org
Cc: bjorn.helgaas@hp.com
Cc: lenb@kernel.org
Cc: linux@dominikbrodowski.net
Cc: tglx@linutronix.de
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Cc: Dominik Brodowski <linux@dominikbrodowski.net>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Len Brown <lenb@kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Diffstat (limited to 'drivers/clocksource')
-rw-r--r-- | drivers/clocksource/acpi_pm.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/clocksource/acpi_pm.c b/drivers/clocksource/acpi_pm.c index c20171078d1d..e1129fad96dd 100644 --- a/drivers/clocksource/acpi_pm.c +++ b/drivers/clocksource/acpi_pm.c | |||
@@ -57,11 +57,6 @@ u32 acpi_pm_read_verified(void) | |||
57 | return v2; | 57 | return v2; |
58 | } | 58 | } |
59 | 59 | ||
60 | static cycle_t acpi_pm_read_slow(void) | ||
61 | { | ||
62 | return (cycle_t)acpi_pm_read_verified(); | ||
63 | } | ||
64 | |||
65 | static cycle_t acpi_pm_read(void) | 60 | static cycle_t acpi_pm_read(void) |
66 | { | 61 | { |
67 | return (cycle_t)read_pmtmr(); | 62 | return (cycle_t)read_pmtmr(); |
@@ -88,6 +83,11 @@ static int __init acpi_pm_good_setup(char *__str) | |||
88 | } | 83 | } |
89 | __setup("acpi_pm_good", acpi_pm_good_setup); | 84 | __setup("acpi_pm_good", acpi_pm_good_setup); |
90 | 85 | ||
86 | static cycle_t acpi_pm_read_slow(void) | ||
87 | { | ||
88 | return (cycle_t)acpi_pm_read_verified(); | ||
89 | } | ||
90 | |||
91 | static inline void acpi_pm_need_workaround(void) | 91 | static inline void acpi_pm_need_workaround(void) |
92 | { | 92 | { |
93 | clocksource_acpi_pm.read = acpi_pm_read_slow; | 93 | clocksource_acpi_pm.read = acpi_pm_read_slow; |