From patchwork Thu May 1 06:26:47 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Brian Norris X-Patchwork-Id: 4097511 Return-Path: X-Original-To: patchwork-linux-sh@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 4AD2E9F1E1 for ; Thu, 1 May 2014 06:28:36 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 78AFF20351 for ; Thu, 1 May 2014 06:28:35 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id A34F720304 for ; Thu, 1 May 2014 06:28:34 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1750759AbaEAG14 (ORCPT ); Thu, 1 May 2014 02:27:56 -0400 Received: from mail-pd0-f174.google.com ([209.85.192.174]:47104 "EHLO mail-pd0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753258AbaEAG1x (ORCPT ); Thu, 1 May 2014 02:27:53 -0400 Received: by mail-pd0-f174.google.com with SMTP id w10so1617809pde.5 for ; Wed, 30 Apr 2014 23:27:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=ic7s6lJMpjDhHA4cSzpI+rvwwN1/A3+FyfQVOjSWoG4=; b=FHC2JVYQnyFgU5R4POvab3vGihzibMQbTM+bMbJ2DaXQZ3Lnz034EGJAwKhysWTQZP 3HC18ZKBr7BbohjW9TBeYEHKLEgokLWFveVv6h9QRTggpZba1MVrt40sLuNaLmOYsmfv LwJYqidmrhNTqLXmeTItKF6fqBCLv1eQjKKi7Ejym0tu95Z5OE86yU1A6oJBKA7i8yHp +VDNjpVdpjWD+uu1raRphUaq97LXgKFqLxwzrCeDiKmogF+ZCAiYjsWPXuBytlgk498H ihCeECuygMXeMrsa5WulVOF6PRf6ujXaj1Xmp5ObF/oKFDLID8m9nQHfKWYGOjNkzwlx toxA== X-Received: by 10.67.8.102 with SMTP id dj6mr17767527pad.10.1398925672489; Wed, 30 Apr 2014 23:27:52 -0700 (PDT) Received: from norris-Latitude-E6410.globalsuite.net ([12.104.145.50]) by mx.google.com with ESMTPSA id yq4sm149337568pab.34.2014.04.30.23.27.51 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 30 Apr 2014 23:27:51 -0700 (PDT) From: Brian Norris To: Linux Kernel Cc: Brian Norris , Huang Shijie , Marek Vasut , , linux-sh@vger.kernel.org Subject: [PATCH v2 12/12] sh: defconfig: add MTD_SPI_NOR (new dependency for M25P80) Date: Wed, 30 Apr 2014 23:26:47 -0700 Message-Id: <1398925607-7482-13-git-send-email-computersforpeace@gmail.com> X-Mailer: git-send-email 1.8.3.2 In-Reply-To: <1398925607-7482-1-git-send-email-computersforpeace@gmail.com> References: <1398925607-7482-1-git-send-email-computersforpeace@gmail.com> Sender: linux-sh-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-sh@vger.kernel.org X-Spam-Status: No, score=-7.4 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, T_DKIM_INVALID, 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 This defconfig contains the CONFIG_M25P80 symbol, which is now dependent on the MTD_SPI_NOR symbol. Add CONFIG_MTD_SPI_NOR to satisfy the new dependency. At the same time, drop the now-nonexistent CONFIG_MTD_CHAR symbol. Signed-off-by: Brian Norris Cc: linux-sh@vger.kernel.org Cc: linux-kernel@vger.kernel.org --- arch/sh/configs/sh7757lcr_defconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/sh/configs/sh7757lcr_defconfig b/arch/sh/configs/sh7757lcr_defconfig index cfde98ddb29d..c5fda5636fd1 100644 --- a/arch/sh/configs/sh7757lcr_defconfig +++ b/arch/sh/configs/sh7757lcr_defconfig @@ -38,9 +38,9 @@ CONFIG_IPV6=y CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" # CONFIG_FW_LOADER is not set CONFIG_MTD=y -CONFIG_MTD_CHAR=y CONFIG_MTD_BLOCK=y CONFIG_MTD_M25P80=y +CONFIG_MTD_SPI_NOR=y CONFIG_BLK_DEV_RAM=y CONFIG_SCSI=y CONFIG_BLK_DEV_SD=y