Received: by 2002:a5b:505:0:0:0:0:0 with SMTP id o5csp97986ybp; Thu, 3 Oct 2019 10:43:24 -0700 (PDT) X-Google-Smtp-Source: APXvYqzEeJxORmaPpcuPpM3+ah5CazGpl/dxWJmw8Hb9H0YqV6tIyyCWIJGkPe06zg/nLEkjkaDW X-Received: by 2002:a17:906:b801:: with SMTP id dv1mr1152110ejb.314.1570124603954; Thu, 03 Oct 2019 10:43:23 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1570124603; cv=none; d=google.com; s=arc-20160816; b=AXoXUZ/53qblWAxn6s5icvYBRt5fK0AK+R+5/K2RP55WwdB5saNMRKI6IEwvi1fJ5B nd//jCPOAaNHBEe65jLkItZkS3FUkzW45QwsdUaaYV+44nyjMBDhqrf2C+vXhOt7vlW6 8INpFVHYVRMrVYZyDDWQZC5jztqzw7AvbuIi/V9aPjX3/RNgG9iJ/bBUoxOQK1mjzKOD G3TQGOgFi462Ce8j5+R+QRXxdGq31ZpspvN89oTxZsN2Rd/rhwBzEWBiCfDaic38Ex1q MlGJwF400nu4j7RR1h2aATlSRb12vjh4BrMSmGxkQC3dFUe06RCU+833Hjfkd6dkwhzr cwiw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=I5mcQHEzQ3y/EM3YwoDPunFVoE1EQTWfv7/PtbpW020=; b=AqRUQeJdo0eJtztpOsKBDJioBH//dsrmX4HcfY1ITEo4OwsAKzRgCPMA+vqaz6/H5G ilzCAk63H9TvxNlqCcXkKmk61x0bdVOqs+xbDdbkl+OlJptoBZF92X6JIR8lAgk0Navv lTO4KlSnEq7cGq0/4IPmq+4qvFUT8Epvhtrkq9/8G7wb2n4gOg51zugWgpXzJNxsF0Tx f6pEVFhIBgC4uzstiXtaAwmC0W45/Ei8dGI5W8EQLAWDAqPKqpaMIdWVp8AtAnVgtmgv NcupVO2rY5uAJDPpBa6EXMolGnhAiZiyBPoTeMZiD1Re0D6ZjPkQBpyMHt8Er3qmAxf6 ctAw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=IptwCjO6; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id z33si2153852edz.314.2019.10.03.10.42.59; Thu, 03 Oct 2019 10:43:23 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=IptwCjO6; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731490AbfJCQRB (ORCPT + 99 others); Thu, 3 Oct 2019 12:17:01 -0400 Received: from mail.kernel.org ([198.145.29.99]:42356 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2387779AbfJCQQ6 (ORCPT ); Thu, 3 Oct 2019 12:16:58 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 5EC1B20865; Thu, 3 Oct 2019 16:16:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1570119417; bh=DM6CKKGHX4IgKpzSLPPrNa7vM4k4yCQtzVToryn8A5Q=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=IptwCjO6Qcst30Pq22wK9R6Fhk81zY2yTOgULJ7RdR+qlzqMCVWuIbhkBO49BTAEk 3QGukHvt6gotAGR01sNoQ3djBBlApLPuSr2fxUJIn8KBQYU8TP/ccLVeAv3+ehuerJ r7h1d4FyZPR/TzJV9OOicJdnUBfkL71alOWD0ncw= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Randy Dunlap , Hans Verkuil , Mauro Carvalho Chehab , Sasha Levin Subject: [PATCH 4.19 057/211] media: media/platform: fsl-viu.c: fix build for MICROBLAZE Date: Thu, 3 Oct 2019 17:52:03 +0200 Message-Id: <20191003154501.340506559@linuxfoundation.org> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20191003154447.010950442@linuxfoundation.org> References: <20191003154447.010950442@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Randy Dunlap [ Upstream commit 6898dd580a045341f844862ceb775144156ec1af ] arch/microblaze/ defines out_be32() and in_be32(), so don't do that again in the driver source. Fixes these build warnings: ../drivers/media/platform/fsl-viu.c:36: warning: "out_be32" redefined ../arch/microblaze/include/asm/io.h:50: note: this is the location of the previous definition ../drivers/media/platform/fsl-viu.c:37: warning: "in_be32" redefined ../arch/microblaze/include/asm/io.h:53: note: this is the location of the previous definition Fixes: 29d750686331 ("media: fsl-viu: allow building it with COMPILE_TEST") Signed-off-by: Randy Dunlap Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab Signed-off-by: Sasha Levin --- drivers/media/platform/fsl-viu.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/media/platform/fsl-viu.c b/drivers/media/platform/fsl-viu.c index 0273302aa7412..83086eea14500 100644 --- a/drivers/media/platform/fsl-viu.c +++ b/drivers/media/platform/fsl-viu.c @@ -37,7 +37,7 @@ #define VIU_VERSION "0.5.1" /* Allow building this driver with COMPILE_TEST */ -#ifndef CONFIG_PPC +#if !defined(CONFIG_PPC) && !defined(CONFIG_MICROBLAZE) #define out_be32(v, a) iowrite32be(a, (void __iomem *)v) #define in_be32(a) ioread32be((void __iomem *)a) #endif -- 2.20.1