[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Message-ID: <20090825075132.GA18240@infomag.iguana.be>
Date: Tue, 25 Aug 2009 09:51:32 +0200
From: Wim Van Sebroeck <wim@...ana.be>
To: Linus Torvalds <torvalds@...ux-foundation.org>
Cc: Andrew Morton <akpm@...ux-foundation.org>,
LKML <linux-kernel@...r.kernel.org>,
Florian Fainelli <florian@...nwrt.org>
Subject: Re: [WATCHDOG] v2.6.31-rc ar7_wdt fix
Hi Linus,
Can we get this fix in before 2.6.31 ? Else people using the ar7 platform will have a compilation failure.
Thanks in advance,
Wim.
> Hi Linus,
>
> Please pull from 'master' branch of
> git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog.git
> or if master.kernel.org hasn't synced up yet:
> master.kernel.org:/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog.git
>
> This will update the following files:
>
> drivers/watchdog/ar7_wdt.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> with these Changes:
>
> Author: Florian Fainelli <florian@...nwrt.org>
> Date: Wed Jun 3 13:05:48 2009 +0200
>
> [WATCHDOG] ar7_wdt: fix path to ar7-specific headers
>
> AR7 is currently being resubmitted for mainline inclusion
> and we changed the path to the ar7-specific headers
> from ar7 to mach-ar7 to reflect the other MIPS-based
> boards header hierarchy. This patch will avoid any future
> compilation failure due to missing headers.
>
> Signed-off-by: Florian Fainelli <florian@...nwrt.org>
> Signed-off-by: Wim Van Sebroeck <wim@...ana.be>
>
> The Changes can also be looked at on:
> http://www.kernel.org/git/?p=linux/kernel/git/wim/linux-2.6-watchdog.git;a=summary
>
> For completeness, I added the overal diff below.
>
> Greetings,
> Wim.
>
> ================================================================================
> diff --git a/drivers/watchdog/ar7_wdt.c b/drivers/watchdog/ar7_wdt.c
> index 3fe9742..2f8643e 100644
> --- a/drivers/watchdog/ar7_wdt.c
> +++ b/drivers/watchdog/ar7_wdt.c
> @@ -37,7 +37,7 @@
> #include <linux/uaccess.h>
>
> #include <asm/addrspace.h>
> -#include <asm/ar7/ar7.h>
> +#include <asm/mach-ar7/ar7.h>
>
> #define DRVNAME "ar7_wdt"
> #define LONGNAME "TI AR7 Watchdog Timer"
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists