From 412017d3cb7f5faf40776d5f0944e9dc3bfc6787 Mon Sep 17 00:00:00 2001
From: Armando Visconti <armando.visconti@st.com>
Date: Wed, 14 Mar 2012 11:47:08 +0530
Subject: [PATCH] --- yaml --- r: 298169 b: refs/heads/master c:
 04f168524e4b13205404fb46337312c8023d934e h: refs/heads/master i:   298167:
 51cf84d52297b25e087d3dc685fcac20eeb77f08 v: v3

---
 [refs]                             |  2 +-
 trunk/drivers/mtd/nand/fsmc_nand.c | 58 ------------------------------
 2 files changed, 1 insertion(+), 59 deletions(-)

diff --git a/[refs] b/[refs]
index 09523e5657e3..c8304fcb5b4c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7147032485293fc24751e4dede98ff29050fd3bd
+refs/heads/master: 04f168524e4b13205404fb46337312c8023d934e
diff --git a/trunk/drivers/mtd/nand/fsmc_nand.c b/trunk/drivers/mtd/nand/fsmc_nand.c
index 7338d33fe1ed..21d8393d85c4 100644
--- a/trunk/drivers/mtd/nand/fsmc_nand.c
+++ b/trunk/drivers/mtd/nand/fsmc_nand.c
@@ -269,64 +269,6 @@ static struct fsmc_eccplace fsmc_ecc4_sp_place = {
 	}
 };
 
-/*
- * Default partition tables to be used if the partition information not
- * provided through platform data.
- *
- * Default partition layout for small page(= 512 bytes) devices
- * Size for "Root file system" is updated in driver based on actual device size
- */
-static struct mtd_partition partition_info_16KB_blk[] = {
-	{
-		.name = "X-loader",
-		.offset = 0,
-		.size = 4*0x4000,
-	},
-	{
-		.name = "U-Boot",
-		.offset = 0x10000,
-		.size = 20*0x4000,
-	},
-	{
-		.name = "Kernel",
-		.offset = 0x60000,
-		.size = 256*0x4000,
-	},
-	{
-		.name = "Root File System",
-		.offset = 0x460000,
-		.size = MTDPART_SIZ_FULL,
-	},
-};
-
-/*
- * Default partition layout for large page(> 512 bytes) devices
- * Size for "Root file system" is updated in driver based on actual device size
- */
-static struct mtd_partition partition_info_128KB_blk[] = {
-	{
-		.name = "X-loader",
-		.offset = 0,
-		.size = 4*0x20000,
-	},
-	{
-		.name = "U-Boot",
-		.offset = 0x80000,
-		.size = 12*0x20000,
-	},
-	{
-		.name = "Kernel",
-		.offset = 0x200000,
-		.size = 48*0x20000,
-	},
-	{
-		.name = "Root File System",
-		.offset = 0x800000,
-		.size = MTDPART_SIZ_FULL,
-	},
-};
-
-
 /**
  * struct fsmc_nand_data - structure for FSMC NAND device state
  *