diff --git a/[refs] b/[refs] index 94cb8d194dad..1582bfdc9c4f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 48452e5f99ab35d643df0463b6ad11aea8ea7bdc +refs/heads/master: 2602a671ad7321a25d253c080837e4569a9bceed diff --git a/trunk/drivers/acpi/sleep/proc.c b/trunk/drivers/acpi/sleep/proc.c index 232d4b64140b..2d0e6b577502 100644 --- a/trunk/drivers/acpi/sleep/proc.c +++ b/trunk/drivers/acpi/sleep/proc.c @@ -84,10 +84,10 @@ acpi_system_write_sleep(struct file *file, #define HAVE_ACPI_LEGACY_ALARM #endif -static u32 cmos_bcd_read(int offset, int rtc_control); - #ifdef HAVE_ACPI_LEGACY_ALARM +static u32 cmos_bcd_read(int offset, int rtc_control); + static int acpi_system_alarm_seq_show(struct seq_file *seq, void *offset) { u32 sec, min, hr;