From c5ec6dae72fcb0faba636110ff62298d423ef163 Mon Sep 17 00:00:00 2001
From: Lars-Dominik Braun <lars@6xq.net>
Date: Sat, 31 Dec 2011 16:37:04 +0100
Subject: Update NAND patch
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

MTD_PARTITIONS has been removed? No sign of it…
---
 ...08-n35-Support-for-NAND-Flash-on-Acer-n35.patch | 29 ++++------------------
 1 file changed, 5 insertions(+), 24 deletions(-)

(limited to 'linux/3.1.6/0008-n35-Support-for-NAND-Flash-on-Acer-n35.patch')

diff --git a/linux/3.1.6/0008-n35-Support-for-NAND-Flash-on-Acer-n35.patch b/linux/3.1.6/0008-n35-Support-for-NAND-Flash-on-Acer-n35.patch
index 3a72c6a..c579e6b 100644
--- a/linux/3.1.6/0008-n35-Support-for-NAND-Flash-on-Acer-n35.patch
+++ b/linux/3.1.6/0008-n35-Support-for-NAND-Flash-on-Acer-n35.patch
@@ -1,17 +1,5 @@
-From c8955e56555dae6e308b3fa3ea91c8d823402bd5 Mon Sep 17 00:00:00 2001
-From: Jiri Pinkava <jiri.pinkava@vscht.cz>
-Date: Sat, 22 May 2010 05:01:39 +0200
-Subject: [PATCH 08/14] n35: Support for NAND Flash on Acer n35
-
-Signed-off-by: Jiri Pinkava <jiri.pinkava@vscht.cz>
----
- arch/arm/mach-s3c2410/mach-n30.c |   73 ++++++++++++++++++++++++++++++++++++++
- 1 files changed, 73 insertions(+), 0 deletions(-)
-
-diff --git a/arch/arm/mach-s3c2410/mach-n30.c b/arch/arm/mach-s3c2410/mach-n30.c
-index 3158165..c492f5d 100644
---- a/arch/arm/mach-s3c2410/mach-n30.c
-+++ b/arch/arm/mach-s3c2410/mach-n30.c
+--- linux-3.1.6/arch/arm/mach-s3c2410/mach-n30.c.orig	2011-12-31 16:29:50.173870254 +0100
++++ linux-3.1.6/arch/arm/mach-s3c2410/mach-n30.c	2011-12-31 16:35:23.089570614 +0100
 @@ -17,6 +17,7 @@
  #include <linux/kernel.h>
  #include <linux/types.h>
@@ -20,7 +8,7 @@ index 3158165..c492f5d 100644
  #include <linux/gpio_keys.h>
  #include <linux/init.h>
  #include <linux/gpio.h>
-@@ -49,10 +50,69 @@
+@@ -49,10 +50,67 @@
  #include <plat/cpu.h>
  #include <plat/devs.h>
  #include <plat/mci.h>
@@ -29,7 +17,6 @@ index 3158165..c492f5d 100644
  #include <plat/ts.h>
  #include <plat/udc.h>
  
-+#ifdef CONFIG_MTD_PARTITIONS
 +#include <linux/mtd/mtd.h>
 +#include <linux/mtd/nand.h>
 +#include <linux/mtd/nand_ecc.h>
@@ -85,22 +72,19 @@ index 3158165..c492f5d 100644
 +	.sets       = n35_nand_sets,
 +	.ignore_unset_ecc = 1,
 +};
-+#endif
 +
  static struct map_desc n30_iodesc[] __initdata = {
  	/* nothing here yet */
  };
-@@ -492,6 +552,9 @@ static struct platform_device *n35_devices[] __initdata = {
+@@ -476,6 +534,7 @@
  	&s3c_device_rtc,
  	&s3c_device_usbgadget,
  	&s3c_device_sdi,
-+#ifdef CONFIG_MTD_PARTITIONS
 +	&s3c_device_nand,
-+#endif
  	&s3c_device_adc,
  	&s3c_device_ts,
  	&s3c_device_timer[0],
-@@ -681,6 +744,16 @@ static void __init n30_init(void)
+@@ -665,6 +724,16 @@
  	}
  
  	if (machine_is_n35()) {
@@ -117,6 +101,3 @@ index 3158165..c492f5d 100644
  		/* Turn off suspend and switch the selectable USB port
  		 * to USB device mode.  Turn on suspend for the host
  		 * port since it is not connected on the N35.
--- 
-1.7.3.1
-
-- 
cgit v1.2.3