summaryrefslogtreecommitdiff
path: root/arch/cris
diff options
context:
space:
mode:
authorNiklas Cassel <niklas.cassel@axis.com>2016-06-10 19:21:20 +0300
committerJesper Nilsson <jespern@axis.com>2016-09-23 16:27:57 +0300
commit0e1847c4b1592fcb1e66f1e427105d2ff8781271 (patch)
tree409043ffb3b3ed53b6ef390ba4d399191bcb6cc5 /arch/cris
parent4c241d3c7bd628df7e84712046e9c130d48cae21 (diff)
downloadlinux-0e1847c4b1592fcb1e66f1e427105d2ff8781271.tar.xz
cris: v10: axisflashmap: remove unused ifdefs
The Kconfig CONFIG_ETRAX_AXISFLASHMAP_MTD0WHOLE does not exist for crisv10, so remove it. Signed-off-by: Niklas Cassel <niklas.cassel@axis.com> Signed-off-by: Jesper Nilsson <jespern@axis.com>
Diffstat (limited to 'arch/cris')
-rw-r--r--arch/cris/arch-v10/drivers/axisflashmap.c19
1 files changed, 0 insertions, 19 deletions
diff --git a/arch/cris/arch-v10/drivers/axisflashmap.c b/arch/cris/arch-v10/drivers/axisflashmap.c
index bdc25aa43468..28292da49664 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");