From: William Lee Irwin III <wli@holomorphy.com>
To: sparclinux@vger.kernel.org
Subject: [sparc32] [4/4] rtc warnings and link errors
Date: Tue, 21 Dec 2004 11:42:34 +0000 [thread overview]
Message-ID: <20041221114234.GO771@holomorphy.com> (raw)
The RTC code is throwing off warnings and link errors. This patch
fixes them up.
Index: sparc32-2.6.10-rc3/drivers/char/rtc.c
=================================--- sparc32-2.6.10-rc3.orig/drivers/char/rtc.c 2004-10-07 04:01:30.000000000 -0700
+++ sparc32-2.6.10-rc3/drivers/char/rtc.c 2004-12-21 03:27:52.060875306 -0800
@@ -878,7 +878,7 @@
&rtc_fops
};
-#ifdef RTC_IRQ
+#if defined(RTC_IRQ) && !defined(__sparc__)
static irqreturn_t (*rtc_int_handler_ptr)(int irq, void *dev_id, struct pt_regs *regs);
#endif
Index: sparc32-2.6.10-rc3/drivers/sbus/char/rtc.c
=================================--- sparc32-2.6.10-rc3.orig/drivers/sbus/char/rtc.c 2004-10-07 04:01:41.000000000 -0700
+++ sparc32-2.6.10-rc3/drivers/sbus/char/rtc.c 2004-12-21 03:29:32.959536378 -0800
@@ -20,6 +20,7 @@
#include <linux/poll.h>
#include <linux/init.h>
#include <linux/smp_lock.h>
+#include <asm/io.h>
#include <asm/mostek.h>
#include <asm/system.h>
#include <asm/uaccess.h>
@@ -30,7 +31,7 @@
/* Retrieve the current date and time from the real time clock. */
static void get_rtc_time(struct rtc_time *t)
{
- unsigned long regs = mstk48t02_regs;
+ void * __iomem regs = mstk48t02_regs;
u8 tmp;
spin_lock_irq(&mostek_lock);
@@ -57,7 +58,7 @@
/* Set the current date and time inthe real time clock. */
void set_rtc_time(struct rtc_time *t)
{
- unsigned long regs = mstk48t02_regs;
+ void * __iomem regs = mstk48t02_regs;
u8 tmp;
spin_lock_irq(&mostek_lock);
next reply other threads:[~2004-12-21 11:42 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2004-12-21 11:42 William Lee Irwin III [this message]
2004-12-22 4:07 ` [sparc32] [4/4] rtc warnings and link errors Bob Breuer
2004-12-22 9:06 ` William Lee Irwin III
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=20041221114234.GO771@holomorphy.com \
--to=wli@holomorphy.com \
--cc=sparclinux@vger.kernel.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.