From patchwork Thu Feb 19 17:31:01 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Geert Uytterhoeven X-Patchwork-Id: 5853301 Return-Path: X-Original-To: patchwork-linux-sh@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id DBC40BF440 for ; Thu, 19 Feb 2015 17:31:25 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 2450D202E9 for ; Thu, 19 Feb 2015 17:31:25 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 1359A202E6 for ; Thu, 19 Feb 2015 17:31:22 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752913AbbBSRbT (ORCPT ); Thu, 19 Feb 2015 12:31:19 -0500 Received: from albert.telenet-ops.be ([195.130.137.90]:45032 "EHLO albert.telenet-ops.be" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753005AbbBSRbE (ORCPT ); Thu, 19 Feb 2015 12:31:04 -0500 Received: from ayla.of.borg ([84.193.93.87]) by albert.telenet-ops.be with bizsmtp id uHX21p00a1t5w8s06HX2QY; Thu, 19 Feb 2015 18:31:03 +0100 Received: from ramsan.of.borg ([192.168.97.29] helo=ramsan) by ayla.of.borg with esmtp (Exim 4.82) (envelope-from ) id 1YOUwI-0003Og-C5; Thu, 19 Feb 2015 18:31:02 +0100 Received: from geert by ramsan with local (Exim 4.82) (envelope-from ) id 1YOUwI-00032r-U5; Thu, 19 Feb 2015 18:31:02 +0100 From: Geert Uytterhoeven To: Simon Horman Cc: linux-sh@vger.kernel.org, Geert Uytterhoeven Subject: [PATCH] Mismerge in "Merge branch 'heads/sh-drivers-for-v3.21' into devel" Date: Thu, 19 Feb 2015 18:31:01 +0100 Message-Id: <1424367061-11669-1-git-send-email-geert+renesas@glider.be> X-Mailer: git-send-email 1.9.1 Sender: linux-sh-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-sh@vger.kernel.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Hi Simon, Commit fc41739c30435c50 ("Merge branch 'heads/sh-drivers-for-v3.21' into devel"), the top of renesas-devel-20150218-v3.19, did a mismerge in two files, resurrecting two chunks that had just been removed in commit 62cbd0a23ad0fbe1 ("ARM: shmobile: r8a73a4: ape6evm: Remove legacy platform"). Below is the fix to squash into the merge commit. Signed-off-by: Geert Uytterhoeven --- arch/arm/mach-shmobile/Kconfig | 6 ------ arch/arm/mach-shmobile/Makefile | 1 - 2 files changed, 7 deletions(-) diff --git a/arch/arm/mach-shmobile/Kconfig b/arch/arm/mach-shmobile/Kconfig index c637fb4db3fe427b..0cbe84a7cd68c45f 100644 --- a/arch/arm/mach-shmobile/Kconfig +++ b/arch/arm/mach-shmobile/Kconfig @@ -128,12 +128,6 @@ config ARCH_R8A7779 comment "Renesas ARM SoCs Board Type" -config MACH_APE6EVM - bool "APE6EVM board" - depends on ARCH_R8A73A4 - select SMSC_PHY if SMSC911X - select USE_OF - config MACH_ARMADILLO800EVA bool "Armadillo-800 EVA board" depends on ARCH_R8A7740 diff --git a/arch/arm/mach-shmobile/Makefile b/arch/arm/mach-shmobile/Makefile index 8ceeac59cfbb5774..94890b62ab8cc514 100644 --- a/arch/arm/mach-shmobile/Makefile +++ b/arch/arm/mach-shmobile/Makefile @@ -53,7 +53,6 @@ obj-$(CONFIG_PM_RMOBILE) += pm-rmobile.o ifdef CONFIG_ARCH_SHMOBILE_MULTI obj-$(CONFIG_MACH_MARZEN) += board-marzen-reference.o else -obj-$(CONFIG_MACH_APE6EVM) += board-ape6evm.o obj-$(CONFIG_MACH_BOCKW) += board-bockw.o obj-$(CONFIG_MACH_BOCKW_REFERENCE) += board-bockw-reference.o obj-$(CONFIG_MACH_MARZEN) += board-marzen.o