v2.6.31-rc ar7_wdt fix
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 <[email protected]> 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.
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.
================================================================================
drivers/watchdog/ar7_wdt.c +1 -1
@@ -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"
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.
Quoted 50 lines
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.gitThis will update the following files:
drivers/watchdog/ar7_wdt.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)with these Changes:
Author: Florian Fainelli <[email protected]> Date: Wed Jun 3 13:05:48 2009 +0200[WATCHDOG]
ar7_wdt: fix path to ar7-specific headersAR7 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 <[email protected]>Signed-off-by Wim Van Sebroeck <[email protected]>The Changes can also be looked at on:
http://www.kernel.org/git/?p=linux/kernel/git/wim/linux-2.6-watchdog.git;a=summaryFor completeness, I added the overal diff below.
Greetings,
Wim.================================================================================
drivers/watchdog/ar7_wdt.c +1
-1@@ -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"