From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756002AbdEETtJ (ORCPT ); Fri, 5 May 2017 15:49:09 -0400 Received: from mout.kundenserver.de ([212.227.126.134]:51923 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755968AbdEETtG (ORCPT ); Fri, 5 May 2017 15:49:06 -0400 From: Arnd Bergmann To: Ben Hutchings Cc: stable@vger.kernel.org, Alban Bedel , Paul Burton , Lars-Peter Clausen , Brian Norris , Thomas Gleixner , Linus Walleij , linux-mips@linux-mips.org, linux-kernel@vger.kernel.org, Ralf Baechle , Arnd Bergmann Subject: [PATCH 3.16-stable 85/87] MIPS: Fix the build on jz4740 after removing the custom gpio.h Date: Fri, 5 May 2017 21:47:43 +0200 Message-Id: <20170505194745.3627137-86-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 In-Reply-To: <20170505194745.3627137-1-arnd@arndb.de> References: <20170505194745.3627137-1-arnd@arndb.de> X-Provags-ID: V03:K0:J6mrv7o+7gW9TbulpeDYFh+TvZKTE+3NT9/j4UKAC/eCkpRuQlN RQ1ReEhVO0qkA4NIt9TKvCZ7ECb5mlfIhBGQlqw1WVPSyMU9m8xYEVligF8r8TuYiKLyW7f 66M75T1mwNDCLaCiibvPNy4zMr3WbcRqFAZfxIYlnx873aBfVhpwWVcsx6lUJNAP/+7jmGO coK3RrsNt6hFpWS7FMmIQ== X-UI-Out-Filterresults: notjunk:1;V01:K0:b31yLW2N8aU=:cqJYHTu4Eo8x50KNsPXkLg fMaJgFGUHRmTIS8oYrBxwvmFg44gjfyigUdgm60l0ThEM529xYN7iNGXtK5pmsUetLYZxsYI1 Qa1VIhChrKo3xAbdC+oQjUEQwy+PV4xedjQCuwckyKbTyeY+BRbnpwV5ikFx38zH10le8T1Rj rIioqb8OWVUbedEvdyUo+uaKqiRrR7w4FPts4mb8NtBTTGuJ5eabJHOliXFnEiP7lWOY6r4nf Z1GwWPDndEt3goSBOrjYLyFch7z4ucPsrlgYEUlEAR8gQf9welaqF+xe+Q+pn8hjZ8V08oCQi Zrc613vSz2zMOWWdJhclBHQe+z9dzl+gGLYg7gfGOLH1jqDny66GMKlrm3mujb75RMt975jJ+ jLEUrNUnKjfxxj8AEFMiLgOv+grf3Sj9K6BWbTLth1LDkkW36tMUR6W3LTs9YZnHNV5hWskIC 9mySlV9DEypVHVs7L2w2CsMcHF9FPcPTlVRD5m17iaxWCsYCV/XWItRHb4lsl2rDLNITCIOCE UnIYjidkwf5iUHjs2IpNsh6uzRWdBKl+cI+ckAhti+pSx5gDTkKr98DzYnP+/8du8X2RIjcPO dI1UYkx2ifjSnwSYL3bm4H+RefpMYQgzbCFAL4uMAGNFxOpGV0ZQZziBzyZjb1TfayMCeIWu8 taeVpK4ZR+ix0zM02dKzbPdPlEkwT9lQfqIvLAnYWFzWIdM8gNw3fCgfh3xHlru+smYI= Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Alban Bedel Commit 8293821972679f185562c9d2bfadd897fac40243 upstream. Somehow the wrong version of the patch to remove the use of custom gpio.h on mips has been merged. This patch add the missing fixes for a build error on jz4740 because linux/gpio.h doesn't provide any machine specfics definitions anymore. Signed-off-by: Alban Bedel Cc: Paul Burton Cc: Lars-Peter Clausen Cc: Brian Norris Cc: Thomas Gleixner Cc: Linus Walleij Cc: linux-mips@linux-mips.org Cc: linux-kernel@vger.kernel.org Patchwork: https://patchwork.linux-mips.org/patch/11089/ Signed-off-by: Ralf Baechle Signed-off-by: Arnd Bergmann --- arch/mips/jz4740/board-qi_lb60.c | 1 + arch/mips/jz4740/gpio.c | 1 + 2 files changed, 2 insertions(+) diff --git a/arch/mips/jz4740/board-qi_lb60.c b/arch/mips/jz4740/board-qi_lb60.c index 088e92a79ae6..7da9ff143499 100644 --- a/arch/mips/jz4740/board-qi_lb60.c +++ b/arch/mips/jz4740/board-qi_lb60.c @@ -25,6 +25,7 @@ #include #include +#include #include #include #include diff --git a/arch/mips/jz4740/gpio.c b/arch/mips/jz4740/gpio.c index 00b798d2fb7c..000d2d91b704 100644 --- a/arch/mips/jz4740/gpio.c +++ b/arch/mips/jz4740/gpio.c @@ -27,6 +27,7 @@ #include #include +#include #include "irq.h" -- 2.9.0