From 2d8fbfac56368ea3c8137b27b27528e441a3a021 Mon Sep 17 00:00:00 2001
From: Marek Vasut <marek.vasut@gmail.com>
Date: Thu, 3 Jun 2010 03:50:10 +0200
Subject: [PATCH] --- yaml --- r: 200799 b: refs/heads/master c:
 60adc112bbd430b90cbafecc19e6e9be2e2000e3 h: refs/heads/master i:   200797:
 7751cec40d1fd703764706cd96f4fb60e089fd53   200795:
 e36a7ef3135d1accb9d94e3485a12284be583213   200791:
 05b373513efe36bb00ab76267abd6a9b5e811e10   200783:
 41dbc1c72ba1a751cb47aeb8b3f51469a7cd534c   200767:
 5f6921f3ec82472dbf80fb8652a757a748fab64c v: v3

---
 [refs]                       |  2 +-
 trunk/arch/arm/mach-pxa/z2.c | 26 ++++++++++----------------
 2 files changed, 11 insertions(+), 17 deletions(-)

diff --git a/[refs] b/[refs]
index cf62b118fae4..3bc02a72aea3 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 56b925fccc58cd43fc553a8302dbbdd440aef288
+refs/heads/master: 60adc112bbd430b90cbafecc19e6e9be2e2000e3
diff --git a/trunk/arch/arm/mach-pxa/z2.c b/trunk/arch/arm/mach-pxa/z2.c
index f5d1ae3db3a4..d303c6929d32 100644
--- a/trunk/arch/arm/mach-pxa/z2.c
+++ b/trunk/arch/arm/mach-pxa/z2.c
@@ -3,8 +3,9 @@
  *
  *  Support for the Zipit Z2 Handheld device.
  *
- *  Author: 	Ken McGuire
- *  Created:	Jan 25, 2009
+ *  Copyright (C) 2009-2010 Marek Vasut <marek.vasut@gmail.com>
+ *
+ *  Based on research and code by: Ken McGuire
  *  Based on mainstone.c as modified for the Zipit Z2.
  *
  *  This program is free software; you can redistribute it and/or modify
@@ -157,21 +158,14 @@ static struct mtd_partition z2_flash_parts[] = {
 	{
 		.name	= "U-Boot Bootloader",
 		.offset	= 0x0,
-		.size	= 0x20000,
-	},
-	{
-		.name	= "Linux Kernel",
-		.offset	= 0x20000,
-		.size	= 0x220000,
-	},
-	{
-		.name	= "Filesystem",
-		.offset	= 0x240000,
-		.size	= 0x5b0000,
-	},
-	{
+		.size	= 0x40000,
+	}, {
 		.name	= "U-Boot Environment",
-		.offset	= 0x7f0000,
+		.offset	= 0x40000,
+		.size	= 0x60000,
+	}, {
+		.name	= "Flash",
+		.offset	= 0x60000,
 		.size	= MTDPART_SIZ_FULL,
 	},
 };