From: Karel Zak <kzak@redhat.com>
Date: Wed, 26 Nov 2008 13:31:19 +0000 (+0100)
Subject: hwclock: clock.h is included more than once
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=715814d9507e9365129bf58be67a8ab5a4dd18d6;p=util-linux

hwclock: clock.h is included more than once

Signed-off-by: Karel Zak <kzak@redhat.com>
---

diff --git a/hwclock/kd.c b/hwclock/kd.c
index 6be5fabd..3b5708a9 100644
--- a/hwclock/kd.c
+++ b/hwclock/kd.c
@@ -1,9 +1,9 @@
 /* kd.c - KDGHWCLK stuff, possibly m68k only - deprecated */
 
-#ifndef __m68k__
-
 #include "clock.h"
 
+#ifndef __m68k__
+
 struct clock_ops *
 probe_for_kd_clock() {
 	return NULL;
@@ -13,11 +13,9 @@ probe_for_kd_clock() {
 
 #include <unistd.h>		/* for close() */
 #include <fcntl.h>		/* for O_RDONLY */
-#include <errno.h>
 #include <sysexits.h>
 #include <sys/ioctl.h>
 
-#include "clock.h"
 #include "nls.h"
 
 static int con_fd = -1;		/* opened by probe_for_kd_clock() */