From 79f4ba080df990a6eb81782503b1c8fe89f47082 Mon Sep 17 00:00:00 2001
From: Lars-Dominik Braun <lars@6xq.net>
Date: Sat, 31 Dec 2011 16:58:32 +0100
Subject: Update powermanagement patch

Affected by MTD patch
---
 ...management-for-some-LCD-stuff-on-Acer-n35.patch | 27 +++++-----------------
 1 file changed, 6 insertions(+), 21 deletions(-)

diff --git a/linux/3.1.6/0011-n35-Powermanagement-for-some-LCD-stuff-on-Acer-n35.patch b/linux/3.1.6/0011-n35-Powermanagement-for-some-LCD-stuff-on-Acer-n35.patch
index 68e7ed4..f1f25a7 100644
--- a/linux/3.1.6/0011-n35-Powermanagement-for-some-LCD-stuff-on-Acer-n35.patch
+++ b/linux/3.1.6/0011-n35-Powermanagement-for-some-LCD-stuff-on-Acer-n35.patch
@@ -1,27 +1,15 @@
-From 3dad22d3a6e269ea7387c756592fd831fbd7810e Mon Sep 17 00:00:00 2001
-From: Jiri Pinkava <jiri.pinkava@vscht.cz>
-Date: Mon, 24 May 2010 11:03:52 +0200
-Subject: [PATCH 11/14] n35: Powermanagement for some LCD stuff on Acer n35
-
-Signed-off-by: Jiri Pinkava <jiri.pinkava@vscht.cz>
----
- arch/arm/mach-s3c2410/mach-n30.c |   47 ++++++++++++++++++++++++++++++++++++++
- 1 files changed, 47 insertions(+), 0 deletions(-)
-
-diff --git a/arch/arm/mach-s3c2410/mach-n30.c b/arch/arm/mach-s3c2410/mach-n30.c
-index 9c0e5b8..3c784e4 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:56:14.728452388 +0100
++++ linux-3.1.6/arch/arm/mach-s3c2410/mach-n30.c	2011-12-31 16:57:30.185718019 +0100
 @@ -56,6 +56,8 @@
  #include <plat/ts.h>
  #include <plat/udc.h>
  
 +#include <video/platform_lcd.h>
 +
- #ifdef CONFIG_MTD_PARTITIONS
  #include <linux/mtd/mtd.h>
  #include <linux/mtd/nand.h>
-@@ -563,6 +565,45 @@ static struct platform_device n35_backlight = {
+ #include <linux/mtd/nand_ecc.h>
+@@ -545,6 +547,45 @@
  	.id   = -1,
  };
  
@@ -67,7 +55,7 @@ index 9c0e5b8..3c784e4 100644
  static void n30_sdi_set_power(unsigned char power_mode, unsigned short vdd)
  {
  	switch (power_mode) {
-@@ -617,6 +658,7 @@ static struct platform_device *n35_devices[] __initdata = {
+@@ -597,6 +638,7 @@
  	&s3c_device_ts,
  	&s3c_device_timer[0],
  	&n35_backlight,
@@ -75,7 +63,7 @@ index 9c0e5b8..3c784e4 100644
  	&n30_battery,
  	&n35_button_device,
  	&n35_blue_led,
-@@ -806,6 +848,11 @@ static void __init n30_init(void)
+@@ -786,6 +828,11 @@
  	if (machine_is_n35()) {
  		s3c_nand_set_platdata(&n35_nand_info);
  
@@ -87,6 +75,3 @@ index 9c0e5b8..3c784e4 100644
  		/* Clear any locks and write protects on the flash. */
  		WARN_ON(gpio_request(S3C2410_GPC(5), "NAND write protection"));
  		gpio_set_value(S3C2410_GPC(5), 1);
--- 
-1.7.3.1
-
-- 
cgit v1.2.3