From patchwork Mon May 4 20:54:34 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marek Vasut X-Patchwork-Id: 467830 X-Patchwork-Delegate: trini@ti.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from theia.denx.de (theia.denx.de [85.214.87.163]) by ozlabs.org (Postfix) with ESMTP id 1B74614075A for ; Tue, 5 May 2015 06:54:50 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 387BB4B959; Mon, 4 May 2015 22:54:48 +0200 (CEST) Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id SFT-0aOOmFms; Mon, 4 May 2015 22:54:47 +0200 (CEST) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 7FAEC4B953; Mon, 4 May 2015 22:54:47 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 6EE824B952 for ; Mon, 4 May 2015 22:54:45 +0200 (CEST) Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id jInS27UeUQu3 for ; Mon, 4 May 2015 22:54:45 +0200 (CEST) X-policyd-weight: NOT_IN_SBL_XBL_SPAMHAUS=-1.5 NOT_IN_SPAMCOP=-1.5 NOT_IN_BL_NJABL=-1.5 (only DNSBL check requested) Received: from mail-out.m-online.net (mail-out.m-online.net [212.18.0.9]) by theia.denx.de (Postfix) with ESMTPS id 31B464B951 for ; Mon, 4 May 2015 22:54:41 +0200 (CEST) Received: from mail.nefkom.net (unknown [192.168.8.184]) by mail-out.m-online.net (Postfix) with ESMTP id 3lgbz46y4Qz3hkjg; Mon, 4 May 2015 22:54:40 +0200 (CEST) X-Auth-Info: DFTYS0xPMfYfXf/G3+nCZ6hLHVXil4pC9eRx1SCv7MM= Received: from chi.lan (unknown [195.140.253.167]) by smtp-auth.mnet-online.de (Postfix) with ESMTPA id 3lgbz43wvZzvhTZ; Mon, 4 May 2015 22:54:40 +0200 (CEST) From: Marek Vasut To: u-boot@lists.denx.de Date: Mon, 4 May 2015 22:54:34 +0200 Message-Id: <1430772877-7301-1-git-send-email-marex@denx.de> X-Mailer: git-send-email 2.1.4 Cc: Marek Vasut Subject: [U-Boot] [PATCH 1/4] ARM: bcm283x: Repair wdog.h X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.15 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" Trivially fix the include check in wdog.h. Signed-off-by: Marek Vasut Cc: Stephen Warren Cc: Tyler Baker --- arch/arm/mach-bcm283x/include/mach/wdog.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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