Re: mmotm 2009-01-13-16-38 uploaded (rtc-cmos)

[Andrew Morton]

On Wed, 14 Jan 2009 09:07:41 -0800 Randy Dunlap <randy.dunlap@xxxxxxxxxx> wrote:

> On Tue, 13 Jan 2009 16:38:17 -0800 akpm@xxxxxxxxxxxxxxxxxxxx wrote:
> 
> > The mm-of-the-moment snapshot 2009-01-13-16-38 has been uploaded to
> > 
> >    http://userweb.kernel.org/~akpm/mmotm/
> > 
> > and will soon be available at
> > 
> >    git://git.zen-sources.org/zen/mmotm.git
> 
> 
> no HPET enabled:
> 
> mmotm-2009-0113-1638/drivers/rtc/rtc-cmos.c:97: error: redefinition of 'is_hpet_enabled'
> mmotm-2009-0113-1638/arch/x86/include/asm/hpet.h:110: error: previous definition of 'is_hpet_enabled' was here
> 

Caused by rtc-cumulative-style-fixes-fix-fix.patch:

From: KAMEZAWA Hiroyuki <kamezawa.hiroyu@xxxxxxxxxxxxxx>

This was necessary for hpet* functions.

Signed-off-by: KAMEZAWA Hiroyuki <kamezawa.hiroyu@xxxxxxxxxxxxxx>
Cc: Alessandro Zummo <a.zummo@xxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---

 drivers/rtc/rtc-cmos.c |    1 +
 1 file changed, 1 insertion(+)

diff -puN drivers/rtc/rtc-cmos.c~rtc-cumulative-style-fixes-fix-fix drivers/rtc/rtc-cmos.c
--- a/drivers/rtc/rtc-cmos.c~rtc-cumulative-style-fixes-fix-fix
+++ a/drivers/rtc/rtc-cmos.c
@@ -39,6 +39,7 @@
 
 /* this is for "generic access to PC-style RTC" using CMOS_READ/CMOS_WRITE */
 #include <asm-generic/rtc.h>
+#include <asm/hpet.h>
 
 struct cmos_rtc {
 	struct rtc_device	*rtc;
_


alas, we don't know what that fix fixed so I don't know what will break
when I drop it.

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/