From: Sami Kerola <kerolasa@iki.fi>
Date: Sat, 10 Jan 2015 18:45:22 +0000 (+0000)
Subject: rtcwake: fix preprocessor redefinition
X-Git-Tag: v2.27-rc1~111
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=356b2989ae76f63e8382dd08458111a98c42070d;p=thirdparty%2Futil-linux.git

rtcwake: fix preprocessor redefinition

The RTC_AF is expected to be part of linux/rtc.h file.

Signed-off-by: Sami Kerola <kerolasa@iki.fi>
---

diff --git a/sys-utils/rtcwake.c b/sys-utils/rtcwake.c
index 0caab24da9..2fcb5ffa71 100644
--- a/sys-utils/rtcwake.c
+++ b/sys-utils/rtcwake.c
@@ -43,10 +43,9 @@
 #include "closestream.h"
 #include "timeutils.h"
 
-/* constants from legacy PC/AT hardware */
-#define	RTC_PF	0x40
-#define	RTC_AF	0x20
-#define	RTC_UF	0x10
+#ifndef RTC_AF
+# define	RTC_AF	0x20	/* Alarm interrupt */
+#endif
 
 #define ADJTIME_ZONE_STRLEN	8