From patchwork Tue Jul 15 17:00:57 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: sam-the-6 X-Patchwork-Id: 33681 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-qa0-f72.google.com (mail-qa0-f72.google.com [209.85.216.72]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id E67CB201F1 for ; Tue, 15 Jul 2014 17:15:31 +0000 (UTC) Received: by mail-qa0-f72.google.com with SMTP id cm18sf16629500qab.7 for ; Tue, 15 Jul 2014 10:15:31 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:delivered-to:from:to:cc:subject :date:message-id:in-reply-to:references:sender:precedence:list-id :x-original-sender:x-original-authentication-results:mailing-list :list-post:list-help:list-archive:list-unsubscribe; bh=nn86Gfe2clBqQiOp36wnOg0Yhr8cDBcZlPkxI4B7mqM=; b=jgWW/Ioz+tPbg7QjSAPrzRpqvj/MSIQ2Mbd2Odooxs1gAwfn4JRdtTfAGzEcm7FLIp 73v9Um/SNIAb4LrjbOd3RuUzGX5MAETOusGZuiN268gls5VxUSJj7A4ddU8QdNS+J6UF oS9luwwbEEJdEDD6uU7hbrplVjn82i5Q2Few0co7hL8r4qvp0nFA/0aQo796iQBtoopv oI6UwInUG6pev4EYhxuptxTsLaU98PqfXb3mhQnDDJWkJGIA6J2g0SXt1VSnDBqmJQJK ilkfuTlVKNNjwFzwUSDPleHTqqNgaFIKlfSYAEBfXZ85LNm07Yf8OLzvo7BJtLLmq5Rh 4ULw== X-Gm-Message-State: ALoCoQkI8XVrJmIGXrkm/5M89ImoTYgbMDylQx0Emdxwb8wpYskQEw4pIkdJsfIWV7xuABFoTZPy X-Received: by 10.236.155.132 with SMTP id j4mr3879427yhk.56.1405444531823; Tue, 15 Jul 2014 10:15:31 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.49.1 with SMTP id p1ls164513qga.97.gmail; Tue, 15 Jul 2014 10:15:31 -0700 (PDT) X-Received: by 10.220.179.197 with SMTP id br5mr817412vcb.80.1405444531737; Tue, 15 Jul 2014 10:15:31 -0700 (PDT) Received: from mail-vc0-x232.google.com (mail-vc0-x232.google.com [2607:f8b0:400c:c03::232]) by mx.google.com with ESMTPS id h16si7070978vcu.61.2014.07.15.10.15.31 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 15 Jul 2014 10:15:31 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 2607:f8b0:400c:c03::232 as permitted sender) client-ip=2607:f8b0:400c:c03::232; Received: by mail-vc0-f178.google.com with SMTP id la4so4254950vcb.9 for ; Tue, 15 Jul 2014 10:15:31 -0700 (PDT) X-Received: by 10.220.15.8 with SMTP id i8mr2274906vca.45.1405444531663; Tue, 15 Jul 2014 10:15:31 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.221.37.5 with SMTP id tc5csp231389vcb; Tue, 15 Jul 2014 10:15:31 -0700 (PDT) X-Received: by 10.68.139.137 with SMTP id qy9mr23846545pbb.11.1405444529589; Tue, 15 Jul 2014 10:15:29 -0700 (PDT) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id ty10si7267742pac.81.2014.07.15.10.15.28; Tue, 15 Jul 2014 10:15:28 -0700 (PDT) Received-SPF: none (google.com: linux-kernel-owner@vger.kernel.org does not designate permitted sender hosts) client-ip=209.132.180.67; Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758276AbaGOROx (ORCPT + 28 others); Tue, 15 Jul 2014 13:14:53 -0400 Received: from mail-wi0-f180.google.com ([209.85.212.180]:59730 "EHLO mail-wi0-f180.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755703AbaGORCM (ORCPT ); Tue, 15 Jul 2014 13:02:12 -0400 Received: by mail-wi0-f180.google.com with SMTP id n3so4699841wiv.1 for ; Tue, 15 Jul 2014 10:02:11 -0700 (PDT) X-Received: by 10.194.87.134 with SMTP id ay6mr28098480wjb.84.1405443731315; Tue, 15 Jul 2014 10:02:11 -0700 (PDT) Received: from Debian ([94.54.73.8]) by mx.google.com with ESMTPSA id a13sm33812934wjs.12.2014.07.15.10.02.09 for (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Tue, 15 Jul 2014 10:02:11 -0700 (PDT) Received: from sam by Debian with local (Exim 4.80) (envelope-from ) id 1X767D-00042P-6K; Tue, 15 Jul 2014 20:02:07 +0300 From: Sam Asadi To: gregkh@linuxfoundation.org Cc: devel@driverdev.osuosl.org, linux-kernel@vger.kernel.org, Nishanth Menon , Tony Lindgren , sam-the-6 Subject: [PATCH 42/94] ARM: DRA7/AM43XX: fix header definition for omap44xx_restart Date: Tue, 15 Jul 2014 20:00:57 +0300 Message-Id: <1405443709-15288-42-git-send-email-asadi.samuel@gmail.com> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1405443709-15288-1-git-send-email-asadi.samuel@gmail.com> References: <1405443709-15288-1-git-send-email-asadi.samuel@gmail.com> Sender: linux-kernel-owner@vger.kernel.org Precedence: list List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Original-Sender: asadi.samuel@gmail.com X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 2607:f8b0:400c:c03::232 as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org; dkim=neutral (body hash did not verify) header.i=@; dmarc=fail (p=NONE dis=NONE) header.from=gmail.com Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , From: Nishanth Menon omap44xx_restart is defined as a static void inline when DRA7/AM437X is defined alone, which implies that the restart function is no longer functional even though it is built in. So, fix the definition of the same. Signed-off-by: Nishanth Menon Signed-off-by: Tony Lindgren Signed-off-by: sam-the-6 --- arch/arm/mach-omap2/common.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/arch/arm/mach-omap2/common.h b/arch/arm/mach-omap2/common.h index b2d252b..dc571f1 100644 --- a/arch/arm/mach-omap2/common.h +++ b/arch/arm/mach-omap2/common.h @@ -162,7 +162,8 @@ static inline void omap3xxx_restart(enum reboot_mode mode, const char *cmd) } #endif -#if defined(CONFIG_ARCH_OMAP4) || defined(CONFIG_SOC_OMAP5) +#if defined(CONFIG_ARCH_OMAP4) || defined(CONFIG_SOC_OMAP5) || \ + defined(CONFIG_SOC_DRA7XX) || defined(CONFIG_SOC_AM43XX) void omap44xx_restart(enum reboot_mode mode, const char *cmd); #else static inline void omap44xx_restart(enum reboot_mode mode, const char *cmd)