diff options
| author | Mark Brown <broonie@linaro.org> | 2013-07-22 11:16:51 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2013-07-22 11:16:51 +0100 |
| commit | 9f6772da061814c2962aeb7d79231f7510dba313 (patch) | |
| tree | e0c4a856204af6adff125ee61fe1f3059cada71b /drivers/acpi/internal.h | |
| parent | d998ec4860d366424a55059093bb022beb38a61d (diff) | |
| parent | 0f4a56e16d5fc9028b62ba529177a3109513e111 (diff) | |
Merge tag 'v3.10.2' into linux-linaro-lsk-androidlsk-android
This is the 3.10.2 stable release
Diffstat (limited to 'drivers/acpi/internal.h')
| -rw-r--r-- | drivers/acpi/internal.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/acpi/internal.h b/drivers/acpi/internal.h index c610a76d92c..63a08549bfa 100644 --- a/drivers/acpi/internal.h +++ b/drivers/acpi/internal.h @@ -50,6 +50,11 @@ void acpi_memory_hotplug_init(void); #else static inline void acpi_memory_hotplug_init(void) {} #endif +#ifdef CONFIG_X86 +void acpi_cmos_rtc_init(void); +#else +static inline void acpi_cmos_rtc_init(void) {} +#endif void acpi_sysfs_add_hotplug_profile(struct acpi_hotplug_profile *hotplug, const char *name); |