From patchwork Fri Aug 3 13:37:44 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michal Simek X-Patchwork-Id: 174991 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from theia.denx.de (theia.denx.de [85.214.87.163]) by ozlabs.org (Postfix) with ESMTP id D92892C0095 for ; Fri, 3 Aug 2012 23:37:59 +1000 (EST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 51B482807B; Fri, 3 Aug 2012 15:37:58 +0200 (CEST) X-Virus-Scanned: Debian amavisd-new at theia.denx.de Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 7ZXexnyuvEkq; Fri, 3 Aug 2012 15:37:58 +0200 (CEST) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 248282807E; Fri, 3 Aug 2012 15:37:56 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 0DBC52807E for ; Fri, 3 Aug 2012 15:37:54 +0200 (CEST) X-Virus-Scanned: Debian amavisd-new at theia.denx.de Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id eznL-M6sUCP0 for ; Fri, 3 Aug 2012 15:37:50 +0200 (CEST) X-policyd-weight: NOT_IN_SBL_XBL_SPAMHAUS=-1.5 NOT_IN_SPAMCOP=-1.5 NOT_IN_BL_NJABL=-1.5 (only DNSBL check requested) Received: from mail-wi0-f180.google.com (mail-wi0-f180.google.com [209.85.212.180]) by theia.denx.de (Postfix) with ESMTPS id B19B12807B for ; Fri, 3 Aug 2012 15:37:48 +0200 (CEST) Received: by wibhm6 with SMTP id hm6so503705wib.9 for ; Fri, 03 Aug 2012 06:37:48 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer:x-gm-message-state; bh=iM0L0Yq17S+8swsxvJR4HaQT8MmnH3qdAN3Yyqw0UYE=; b=UMNh4HID3Il5NwE4shzwIe1aNC1NIwybKkIfS0PvrI60ukC7QGt/EK65lu3rCRmimP UlkNlVD5iDpbYKt0MjIWeWq03u6MiWghQbhkt/hhDXsB/JyPXbHVaJ57Ymil28EVYR7X VLLzFErQ3MvStUfbaTTnJAni6wTp2D2CQ2jCVG0cPrfdOMdnaMBJLAbk2xSHOiPqs+L+ kRrC374ZJFvwvsUczeksxNB0zZ3XQ251udbChITxoarGDKaYS3kssPUMC89HIOSIqMeF lWhqUPb7sCF+dRisn9Sb9ZvO2N4FT6NmG0pZdeJZnouXy69WwKFlpudAkRQ6YlfXu1u5 ZHLA== Received: by 10.216.147.4 with SMTP id s4mr1000902wej.9.1344001067937; Fri, 03 Aug 2012 06:37:47 -0700 (PDT) Received: from localhost (nat-2.starnet.cz. [92.62.224.2]) by mx.google.com with ESMTPS id ef5sm25980541wib.3.2012.08.03.06.37.46 (version=TLSv1/SSLv3 cipher=OTHER); Fri, 03 Aug 2012 06:37:47 -0700 (PDT) From: Michal Simek To: u-boot@lists.denx.de Date: Fri, 3 Aug 2012 15:37:44 +0200 Message-Id: <1344001064-762-1-git-send-email-monstr@monstr.eu> X-Mailer: git-send-email 1.7.0.4 X-Gm-Message-State: ALoCoQnCEuLrRpFcZy0feO+uoSqMpdqPFhGOlQctUAGYih6DIQYRIve9X2djRp3Hh6KsE1uK6lDn Subject: [U-Boot] [PATCH] spi: Fix merge conflicts - Makefile X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.11 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: u-boot-bounces@lists.denx.de Errors-To: u-boot-bounces@lists.denx.de The patch "spi: tegra2: rename tegra2_spi.* to tegra_spi.*" (sha1: edffa63d3d6e76991998789f9fcbaa483731ca65) renamed tegra2_spi.c to tegra_spi.c and the patch "Merge branch 'master' of git://git.denx.de/u-boot-microblaze" (sha1: d978780b2e676c005460cd561f4f15b5220bdf49) has wrongly resolved confict. This patch fix it. Signed-off-by: Michal Simek --- drivers/spi/Makefile | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/drivers/spi/Makefile b/drivers/spi/Makefile index cd3f9fa..80b981f 100644 --- a/drivers/spi/Makefile +++ b/drivers/spi/Makefile @@ -44,7 +44,6 @@ COBJS-$(CONFIG_SOFT_SPI) += soft_spi.o COBJS-$(CONFIG_SH_SPI) += sh_spi.o COBJS-$(CONFIG_FSL_ESPI) += fsl_espi.o COBJS-$(CONFIG_TEGRA_SPI) += tegra_spi.o -COBJS-$(CONFIG_TEGRA2_SPI) += tegra2_spi.o COBJS-$(CONFIG_XILINX_SPI) += xilinx_spi.o COBJS := $(COBJS-y)