From: yegor_sub1@visionsystems.de (Yegor Yefremov)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 2/5] ks8695_wdt: explicitly define the SoC timer tick base rate
Date: Wed, 20 Oct 2010 11:11:24 +0200 [thread overview]
Message-ID: <4CBEB23C.7040208@visionsystems.de> (raw)
In-Reply-To: <20101020045131.GY12979@mail.wantstofly.org>
Am 20.10.2010 06:51, schrieb Lennert Buytenhek:
> ..instead of including mach/timex.h, as the latter is going away.
>
> Signed-off-by: Lennert Buytenhek <buytenh@secretlab.ca>
> ---
> drivers/watchdog/ks8695_wdt.c | 3 ++-
> 1 files changed, 2 insertions(+), 1 deletions(-)
>
> diff --git a/drivers/watchdog/ks8695_wdt.c b/drivers/watchdog/ks8695_wdt.c
> index 2852bb2..0060519 100644
> --- a/drivers/watchdog/ks8695_wdt.c
> +++ b/drivers/watchdog/ks8695_wdt.c
> @@ -21,9 +21,10 @@
> #include <linux/watchdog.h>
> #include <linux/io.h>
> #include <linux/uaccess.h>
> -#include <mach/timex.h>
> #include <mach/regs-timer.h>
>
> +#define KS8695_CLOCK_RATE 25000000
> +
In this way KS8695_CLOCK_RATE will be defined twice: here and in /arch/arm/mach-ks8695/include/mach/hardware.h
> #define WDT_DEFAULT_TIME 5 /* seconds */
> #define WDT_MAX_TIME 171 /* seconds */
I tried without redefining the macro and it compiles without errors.
Regards,
Yegor
..instead of including mach/timex.h, as the latter is going away.
Signed-off-by: Lennert Buytenhek <buytenh@secretlab.ca>
Signed-off-by: Yegor Yefremov <yegorslists@googlemail.com>
---
drivers/watchdog/ks8695_wdt.c | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
Index: b/drivers/watchdog/ks8695_wdt.c
===================================================================
--- a/drivers/watchdog/ks8695_wdt.c 2010-08-27 01:47:12.000000000 +0200
+++ b/drivers/watchdog/ks8695_wdt.c 2010-10-20 10:47:14.000000000 +0200
@@ -21,7 +21,7 @@
#include <linux/watchdog.h>
#include <linux/io.h>
#include <linux/uaccess.h>
-#include <mach/timex.h>
+#include <mach/hardware.h>
#include <mach/regs-timer.h>
#define WDT_DEFAULT_TIME 5 /* seconds */
next prev parent reply other threads:[~2010-10-20 9:11 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-10-20 4:51 [PATCH 2/5] ks8695_wdt: explicitly define the SoC timer tick base rate Lennert Buytenhek
2010-10-20 9:11 ` Yegor Yefremov [this message]
2010-10-20 9:26 ` Lennert Buytenhek
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=4CBEB23C.7040208@visionsystems.de \
--to=yegor_sub1@visionsystems.de \
--cc=linux-arm-kernel@lists.infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.