Message ID | 1430772877-7301-1-git-send-email-marex@denx.de |
---|---|
State | Accepted |
Delegated to: | Tom Rini |
Headers | show |
On Mon, May 04, 2015 at 10:54:34PM +0200, Marek Vasut wrote: > Trivially fix the include check in wdog.h. > > Signed-off-by: Marek Vasut <marex at denx.de> > Cc: Stephen Warren <swarren at wwwdotorg.org> > Cc: Tyler Baker <tyler.baker at linaro.org> Applied to u-boot/master, thanks!
diff --git a/arch/arm/mach-bcm283x/include/mach/wdog.h b/arch/arm/mach-bcm283x/include/mach/wdog.h index beb6a08..cbc350e 100644 --- a/arch/arm/mach-bcm283x/include/mach/wdog.h +++ b/arch/arm/mach-bcm283x/include/mach/wdog.h @@ -4,8 +4,8 @@ * SPDX-License-Identifier: GPL-2.0 */ -#ifndef _BCM2835_TIMER_H -#define _BCM2835_TIMER_H +#ifndef _BCM2835_WDOG_H +#define _BCM2835_WDOG_H #ifdef CONFIG_BCM2836 #define BCM2835_WDOG_PHYSADDR 0x3f100000
Trivially fix the include check in wdog.h. Signed-off-by: Marek Vasut <marex@denx.de> Cc: Stephen Warren <swarren@wwwdotorg.org> Cc: Tyler Baker <tyler.baker@linaro.org> --- arch/arm/mach-bcm283x/include/mach/wdog.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)