summaryrefslogtreecommitdiff
path: root/recipes/linux/linux-2.6.32+2.6.33-rc2/0001-pxafb-fix-regression-from-d2a34c13e7ccec5d06eafd60e6.patch
diff options
context:
space:
mode:
authorMartin Jansa <Martin.Jansa@gmail.com>2010-01-06 15:08:36 +0100
committerMartin Jansa <Martin.Jansa@gmail.com>2010-01-06 19:21:24 +0100
commit5bf599e4c9454b4cb5cdf0b360cb830752847c85 (patch)
treef28e5c05ec2bb0a318e9301acaf29ff2e8d694cf /recipes/linux/linux-2.6.32+2.6.33-rc2/0001-pxafb-fix-regression-from-d2a34c13e7ccec5d06eafd60e6.patch
parentf75f8d6bc249c4bd68d439b8e416075bb8002162 (diff)
linux: move 2.6.33 from rc2 to rc3
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'recipes/linux/linux-2.6.32+2.6.33-rc2/0001-pxafb-fix-regression-from-d2a34c13e7ccec5d06eafd60e6.patch')
-rw-r--r--recipes/linux/linux-2.6.32+2.6.33-rc2/0001-pxafb-fix-regression-from-d2a34c13e7ccec5d06eafd60e6.patch40
1 files changed, 0 insertions, 40 deletions
diff --git a/recipes/linux/linux-2.6.32+2.6.33-rc2/0001-pxafb-fix-regression-from-d2a34c13e7ccec5d06eafd60e6.patch b/recipes/linux/linux-2.6.32+2.6.33-rc2/0001-pxafb-fix-regression-from-d2a34c13e7ccec5d06eafd60e6.patch
deleted file mode 100644
index 3d79409233..0000000000
--- a/recipes/linux/linux-2.6.32+2.6.33-rc2/0001-pxafb-fix-regression-from-d2a34c13e7ccec5d06eafd60e6.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From b448a4e11127012a96bae8689e019879fbb8470f Mon Sep 17 00:00:00 2001
-From: Martin Jansa <Martin.Jansa@gmail.com>
-Date: Mon, 28 Dec 2009 16:45:33 +0100
-Subject: [PATCH] pxafb: fix regression from d2a34c13e7ccec5d06eafd60e6f80ea531b34668
-
-fbi->dev->platform_data is void * and gcc does not allow to access
-!fbi->dev->platform_data->smart_update without cast platform_data to
-(struct pxafb_mach_info) or assignment as used in this patch.
-
-Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
----
- drivers/video/pxafb.c | 7 ++++++-
- 1 files changed, 6 insertions(+), 1 deletions(-)
-
-diff --git a/drivers/video/pxafb.c b/drivers/video/pxafb.c
-index 415858b..241468c 100644
---- a/drivers/video/pxafb.c
-+++ b/drivers/video/pxafb.c
-@@ -1223,12 +1223,17 @@ static int pxafb_smart_thread(void *arg)
- struct pxafb_info *fbi = arg;
- struct pxafb_mach_info *inf;
-
-- if (!fbi || !fbi->dev->platform_data->smart_update) {
-+ if (!fbi) {
- pr_err("%s: not properly initialized, thread terminated\n",
- __func__);
- return -EINVAL;
- }
- inf = fbi->dev->platform_data;
-+ if (!inf || !inf->smart_update) {
-+ pr_err("%s: not properly initialized, thread terminated\n",
-+ __func__);
-+ return -EINVAL;
-+ }
-
- pr_debug("%s(): task starting\n", __func__);
-
---
-1.6.6
-