From patchwork Thu Aug 6 18:20:36 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Krzysztof Kozlowski X-Patchwork-Id: 247518 Delivered-To: patch@linaro.org Received: by 2002:a92:cc90:0:0:0:0:0 with SMTP id x16csp1744567ilo; Thu, 6 Aug 2020 11:37:47 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzHXn/0UQ50EZ1Moodc0r7RoCFo0lpOX+LEZoS0MDFLhj8gkJ8o02ozIBy1ze6ei4kkfqdO X-Received: by 2002:aa7:dbd9:: with SMTP id v25mr5487809edt.137.1596739067277; Thu, 06 Aug 2020 11:37:47 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1596739067; cv=none; d=google.com; s=arc-20160816; b=Q6a1H+ANhnUPbNts6tWTY4UPMtf66hPaHIFE+bmGCND8HJ0AGO5ylETJrb5j6c1rvP WJVm0gRnoNtQbxzJJHyEPVNodwSKLVofICTC8BfdLs+9vkLeve+qa6tlf1JvaKOYlrHb LHIdCvynKKUaLhIW8qbfq79W+DEEc1+v0R5i7BiFV7JIrUzG1U6ijhmcPca0K+CHnLom t1+u1sihzJf6jUQhhdtHEtMS5kVoGX0IWLW3mPAT1S1p+Ahjeg9QjUYxeoM89Sp06Swm vpLSJA4qeRR9k7ZU/SRBMoxOY2ulUXGzk9c0TLz2vcJ1TxzbwcBsZsHD0bti4Nk81IlE pqCA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature; bh=f00rwTynNc3TK3ekbPVFHDyznsVKlOtryz0XbkBhsoM=; b=Lev8zyoHjf0N2Lo/CX9mvoYIc4IGd0Xh8sJ2r59ylNb4kp7V4GI3a1EEipZFGJ6UPu bE1zQOFTg+YbeszTJdO0O1pQ+syZlpE/zyS2X+gXsY7QVl2NLWNBCFM1Ogsot9grn67G bXmYLI+DtykgW7jasaWw49yBzfPz/8eI6+ID/fu6hP90yTUZ0dTfLH7lu87WqyL1dVyP IBAcoosVL0zpcCk131+0sEjriCCGFM1D+44Xz3tOhawzkbjTv8FEmsJk3AcfcFdt+iwZ NC7B51g/SF8U9h6L+WiCuNwY4YUrPyNJtujKlRAr4+mzRjkUJozeKsPLXD7p4c8lBu2H i06A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=2CkLjH1W; spf=pass (google.com: domain of linux-samsung-soc-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-samsung-soc-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id z14si3823607edk.480.2020.08.06.11.37.47; Thu, 06 Aug 2020 11:37:47 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-samsung-soc-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=2CkLjH1W; spf=pass (google.com: domain of linux-samsung-soc-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-samsung-soc-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728808AbgHFShq (ORCPT + 4 others); Thu, 6 Aug 2020 14:37:46 -0400 Received: from mail.kernel.org ([198.145.29.99]:58936 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728935AbgHFSf6 (ORCPT ); Thu, 6 Aug 2020 14:35:58 -0400 Received: from localhost.localdomain (unknown [194.230.155.117]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 7D81F22CE3; Thu, 6 Aug 2020 18:22:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1596738176; bh=lU5wNn/T9PmwblR4OUI1J7Lrz/yR8NVfa8Ry3YJWFwQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=2CkLjH1W6F26DkdSLwSedU1vIjnnjDrR3jFSKAOn3jiYv5qhJzJb5IL00vTAcBFWr i2VPDnZGE84wG8GJYdwLd3CVGXta3qSoS5aKbL46Y9IqUmleVAqPH1neNdkw7kR9N0 SWcWUrarZ4rqSDEogsdgJK6OyMBAihDa4woY0v5Y= From: Krzysztof Kozlowski To: linux-kernel@vger.kernel.org Cc: Arnd Bergmann , Krzysztof Kozlowski , Russell King , Kukjin Kim , linux-arm-kernel@lists.infradead.org, linux-samsung-soc@vger.kernel.org Subject: [PATCH v2 19/41] ARM: s3c64xx: remove mach/hardware.h Date: Thu, 6 Aug 2020 20:20:36 +0200 Message-Id: <20200806182059.2431-19-krzk@kernel.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200806181932.2253-1-krzk@kernel.org> References: <20200806181932.2253-1-krzk@kernel.org> Sender: linux-samsung-soc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-samsung-soc@vger.kernel.org From: Arnd Bergmann This header is empty and conflicts with the s3c24xx version of the same file when we merge the two, so stop including it. Signed-off-by: Arnd Bergmann Acked-by: Charles Keepax Signed-off-by: Krzysztof Kozlowski --- arch/arm/mach-s3c64xx/common.c | 1 - arch/arm/mach-s3c64xx/dev-uart.c | 1 - arch/arm/mach-s3c64xx/include/mach/hardware.h | 17 ----------------- arch/arm/mach-s3c64xx/mach-anw6410.c | 1 - arch/arm/mach-s3c64xx/mach-crag6410.c | 1 - arch/arm/mach-s3c64xx/mach-hmt.c | 1 - arch/arm/mach-s3c64xx/mach-ncp.c | 1 - arch/arm/mach-s3c64xx/mach-smdk6400.c | 1 - arch/arm/mach-s3c64xx/mach-smdk6410.c | 1 - arch/arm/mach-s3c64xx/s3c6400.c | 1 - arch/arm/mach-s3c64xx/s3c6410.c | 1 - 11 files changed, 27 deletions(-) delete mode 100644 arch/arm/mach-s3c64xx/include/mach/hardware.h -- 2.17.1 diff --git a/arch/arm/mach-s3c64xx/common.c b/arch/arm/mach-s3c64xx/common.c index c9c20256488b..efda4bfb7948 100644 --- a/arch/arm/mach-s3c64xx/common.c +++ b/arch/arm/mach-s3c64xx/common.c @@ -37,7 +37,6 @@ #include #include -#include #include #include diff --git a/arch/arm/mach-s3c64xx/dev-uart.c b/arch/arm/mach-s3c64xx/dev-uart.c index 5fb59ad30008..021a2b7926fa 100644 --- a/arch/arm/mach-s3c64xx/dev-uart.c +++ b/arch/arm/mach-s3c64xx/dev-uart.c @@ -15,7 +15,6 @@ #include #include -#include #include #include diff --git a/arch/arm/mach-s3c64xx/include/mach/hardware.h b/arch/arm/mach-s3c64xx/include/mach/hardware.h deleted file mode 100644 index c4ed359474de..000000000000 --- a/arch/arm/mach-s3c64xx/include/mach/hardware.h +++ /dev/null @@ -1,17 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0 */ -/* linux/arch/arm/mach-s3c6400/include/mach/hardware.h - * - * Copyright 2008 Openmoko, Inc. - * Copyright 2008 Simtec Electronics - * Ben Dooks - * http://armlinux.simtec.co.uk/ - * - * S3C6400 - Hardware support - */ - -#ifndef __ASM_ARCH_HARDWARE_H -#define __ASM_ARCH_HARDWARE_H __FILE__ - -/* currently nothing here, placeholder */ - -#endif /* __ASM_ARCH_IRQ_H */ diff --git a/arch/arm/mach-s3c64xx/mach-anw6410.c b/arch/arm/mach-s3c64xx/mach-anw6410.c index e783f5b3593a..bb248b12e308 100644 --- a/arch/arm/mach-s3c64xx/mach-anw6410.c +++ b/arch/arm/mach-s3c64xx/mach-anw6410.c @@ -30,7 +30,6 @@ #include #include -#include #include #include diff --git a/arch/arm/mach-s3c64xx/mach-crag6410.c b/arch/arm/mach-s3c64xx/mach-crag6410.c index 223a3d51d8b6..a2fefb2609e7 100644 --- a/arch/arm/mach-s3c64xx/mach-crag6410.c +++ b/arch/arm/mach-s3c64xx/mach-crag6410.c @@ -44,7 +44,6 @@ #include #include