From e76757184f036864d7c21a6fbd8320c43008ea42 Mon Sep 17 00:00:00 2001 From: Jesper Juhl Date: Sun, 18 Dec 2011 01:05:31 +0100 Subject: [PATCH] --- yaml --- r: 277474 b: refs/heads/master c: 1affc46cffad9f2bc7c9ffec85726446903a58f9 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/x86/include/asm/mc146818rtc.h | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 657ccac7f973..3921518af568 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 2ac13462b6d242684996e88a07fbed6dec6af622 +refs/heads/master: 1affc46cffad9f2bc7c9ffec85726446903a58f9 diff --git a/trunk/arch/x86/include/asm/mc146818rtc.h b/trunk/arch/x86/include/asm/mc146818rtc.h index 01fdf5674e24..0e8e85bb7c51 100644 --- a/trunk/arch/x86/include/asm/mc146818rtc.h +++ b/trunk/arch/x86/include/asm/mc146818rtc.h @@ -81,8 +81,8 @@ static inline unsigned char current_lock_cmos_reg(void) #else #define lock_cmos_prefix(reg) do {} while (0) #define lock_cmos_suffix(reg) do {} while (0) -#define lock_cmos(reg) -#define unlock_cmos() +#define lock_cmos(reg) do { } while (0) +#define unlock_cmos() do { } while (0) #define do_i_have_lock_cmos() 0 #define current_lock_cmos_reg() 0 #endif