From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1161021AbcFJQVr (ORCPT ); Fri, 10 Jun 2016 12:21:47 -0400 Received: from bastet.se.axis.com ([195.60.68.11]:60691 "EHLO bastet.se.axis.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932910AbcFJQVq (ORCPT ); Fri, 10 Jun 2016 12:21:46 -0400 From: Niklas Cassel To: , CC: , , , , Niklas Cassel Subject: [PATCH] cris: v10: axisflashmap: remove unused ifdefs Date: Fri, 10 Jun 2016 18:21:20 +0200 Message-ID: <1465575680-6839-1-git-send-email-niklass@axis.com> X-Mailer: git-send-email 2.1.4 MIME-Version: 1.0 Content-Type: text/plain X-Originating-IP: [10.0.5.107] X-ClientProxiedBy: XBOX01.axis.com (10.0.5.15) To XBOX02.axis.com (10.0.5.16) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Niklas Cassel The Kconfig CONFIG_ETRAX_AXISFLASHMAP_MTD0WHOLE does not exist for crisv10, so remove it. Signed-off-by: Niklas Cassel --- arch/cris/arch-v10/drivers/axisflashmap.c | 19 ------------------- 1 file changed, 19 deletions(-) diff --git a/arch/cris/arch-v10/drivers/axisflashmap.c b/arch/cris/arch-v10/drivers/axisflashmap.c index 60d57c5..292dfd8 100644 --- a/arch/cris/arch-v10/drivers/axisflashmap.c +++ b/arch/cris/arch-v10/drivers/axisflashmap.c @@ -177,15 +177,6 @@ static struct mtd_partition axis_partitions[MAX_PARTITIONS] = { }, }; -#ifdef CONFIG_ETRAX_AXISFLASHMAP_MTD0WHOLE -/* Main flash device */ -static struct mtd_partition main_partition = { - .name = "main", - .size = 0, - .offset = 0 -}; -#endif - /* * Probe a chip select for AMD-compatible (JEDEC) or CFI-compatible flash * chips in that order (because the amd_flash-driver is faster). @@ -369,16 +360,6 @@ static int __init init_axis_flash(void) pidx++; } -#ifdef CONFIG_ETRAX_AXISFLASHMAP_MTD0WHOLE - if (mymtd) { - main_partition.size = mymtd->size; - err = mtd_device_register(mymtd, &main_partition, 1); - if (err) - panic("axisflashmap: Could not initialize " - "partition for whole main mtd device!\n"); - } -#endif - if (mymtd) { if (use_default_ptable) { printk(KERN_INFO " Using default partition table.\n"); -- 2.1.4