From a1b17ee0ceb7d443c6a7943947eca8009feba2fb Mon Sep 17 00:00:00 2001
From: Richard Purdie <rpurdie@linux.intel.com>
Date: Thu, 5 Feb 2009 14:05:41 +0000
Subject: linux-moblin: Update psb driver patch

---
 .../packages/linux/linux-moblin-2.6.27/defconfig-menlow   | 15 ++++++++-------
 .../packages/linux/linux-moblin-2.6.27/psb-driver.patch   |  2 +-
 meta-moblin/packages/linux/linux-moblin_2.6.27.bb         |  4 ++--
 3 files changed, 11 insertions(+), 10 deletions(-)

(limited to 'meta-moblin')

diff --git a/meta-moblin/packages/linux/linux-moblin-2.6.27/defconfig-menlow b/meta-moblin/packages/linux/linux-moblin-2.6.27/defconfig-menlow
index 8841ad3ea..30c165622 100644
--- a/meta-moblin/packages/linux/linux-moblin-2.6.27/defconfig-menlow
+++ b/meta-moblin/packages/linux/linux-moblin-2.6.27/defconfig-menlow
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
 # Linux kernel version: 2.6.27
-# Mon Jan 12 17:53:54 2009
+# Wed Jan 14 11:45:36 2009
 #
 # CONFIG_64BIT is not set
 CONFIG_X86_32=y
@@ -2106,16 +2106,17 @@ CONFIG_AGP_NVIDIA=m
 # CONFIG_AGP_VIA is not set
 # CONFIG_AGP_EFFICEON is not set
 CONFIG_DRM=m
-CONFIG_DRM_TDFX=m
+# CONFIG_DRM_TDFX is not set
 # CONFIG_DRM_R128 is not set
 # CONFIG_DRM_RADEON is not set
-CONFIG_DRM_I810=m
-CONFIG_DRM_I830=m
-CONFIG_DRM_I915=m
+# CONFIG_DRM_I810 is not set
+# CONFIG_DRM_I830 is not set
+# CONFIG_DRM_I915 is not set
 # CONFIG_DRM_MGA is not set
-CONFIG_DRM_SIS=m
+# CONFIG_DRM_SIS is not set
 # CONFIG_DRM_VIA is not set
-CONFIG_DRM_SAVAGE=m
+# CONFIG_DRM_SAVAGE is not set
+CONFIG_DRM_PSB=m
 CONFIG_VGASTATE=m
 CONFIG_VIDEO_OUTPUT_CONTROL=y
 CONFIG_FB=y
diff --git a/meta-moblin/packages/linux/linux-moblin-2.6.27/psb-driver.patch b/meta-moblin/packages/linux/linux-moblin-2.6.27/psb-driver.patch
index 64deeeaf5..adc33b492 100644
--- a/meta-moblin/packages/linux/linux-moblin-2.6.27/psb-driver.patch
+++ b/meta-moblin/packages/linux/linux-moblin-2.6.27/psb-driver.patch
@@ -6,7 +6,7 @@ Index: linux-2.6.27/include/drm/drm.h
  	_DRM_AGP = 3,		  /**< AGP/GART */
  	_DRM_SCATTER_GATHER = 4,  /**< Scatter/gather memory for PCI DMA */
  	_DRM_CONSISTENT = 5,	  /**< Consistent memory for PCI DMA */
-+	_DRM_TTM = 6
++	_DRM_TTM = 7
  };
  
  /**
diff --git a/meta-moblin/packages/linux/linux-moblin_2.6.27.bb b/meta-moblin/packages/linux/linux-moblin_2.6.27.bb
index 685956a70..0033f651b 100644
--- a/meta-moblin/packages/linux/linux-moblin_2.6.27.bb
+++ b/meta-moblin/packages/linux/linux-moblin_2.6.27.bb
@@ -1,6 +1,6 @@
 require linux-moblin.inc
 
-PR = "r6"
+PR = "r7"
 PE = "1"
 
 DEFAULT_PREFERENCE = "-1"
@@ -54,6 +54,6 @@ SRC_URI = "${KERNELORG_MIRROR}pub/linux/kernel/v2.6/linux-2.6.27.tar.bz2 \
 		file://defconfig-menlow \
 		file://defconfig-netbook"
 
-SRC_URI_append_menlow = "psb-driver.patch;patch=1"
+SRC_URI_append_menlow = " file://psb-driver.patch;patch=1"
 
 S = "${WORKDIR}/linux-2.6.27"
-- 
cgit v1.2.3