projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote branch 'wireless-next/master' into ath6kl-next
[cascardo/linux.git]
/
arch
/
x86
/
include
/
asm
/
mc146818rtc.h
diff --git
a/arch/x86/include/asm/mc146818rtc.h
b/arch/x86/include/asm/mc146818rtc.h
index
01fdf56
..
0e8e85b
100644
(file)
--- a/
arch/x86/include/asm/mc146818rtc.h
+++ b/
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)
#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
#define do_i_have_lock_cmos() 0
#define current_lock_cmos_reg() 0
#endif