diff options
3 files changed, 11 insertions, 10 deletions
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 8841ad3ea7..30c1656220 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 @@ | |||
| 1 | # | 1 | # |
| 2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
| 3 | # Linux kernel version: 2.6.27 | 3 | # Linux kernel version: 2.6.27 |
| 4 | # Mon Jan 12 17:53:54 2009 | 4 | # Wed Jan 14 11:45:36 2009 |
| 5 | # | 5 | # |
| 6 | # CONFIG_64BIT is not set | 6 | # CONFIG_64BIT is not set |
| 7 | CONFIG_X86_32=y | 7 | CONFIG_X86_32=y |
| @@ -2106,16 +2106,17 @@ CONFIG_AGP_NVIDIA=m | |||
| 2106 | # CONFIG_AGP_VIA is not set | 2106 | # CONFIG_AGP_VIA is not set |
| 2107 | # CONFIG_AGP_EFFICEON is not set | 2107 | # CONFIG_AGP_EFFICEON is not set |
| 2108 | CONFIG_DRM=m | 2108 | CONFIG_DRM=m |
| 2109 | CONFIG_DRM_TDFX=m | 2109 | # CONFIG_DRM_TDFX is not set |
| 2110 | # CONFIG_DRM_R128 is not set | 2110 | # CONFIG_DRM_R128 is not set |
| 2111 | # CONFIG_DRM_RADEON is not set | 2111 | # CONFIG_DRM_RADEON is not set |
| 2112 | CONFIG_DRM_I810=m | 2112 | # CONFIG_DRM_I810 is not set |
| 2113 | CONFIG_DRM_I830=m | 2113 | # CONFIG_DRM_I830 is not set |
| 2114 | CONFIG_DRM_I915=m | 2114 | # CONFIG_DRM_I915 is not set |
| 2115 | # CONFIG_DRM_MGA is not set | 2115 | # CONFIG_DRM_MGA is not set |
| 2116 | CONFIG_DRM_SIS=m | 2116 | # CONFIG_DRM_SIS is not set |
| 2117 | # CONFIG_DRM_VIA is not set | 2117 | # CONFIG_DRM_VIA is not set |
| 2118 | CONFIG_DRM_SAVAGE=m | 2118 | # CONFIG_DRM_SAVAGE is not set |
| 2119 | CONFIG_DRM_PSB=m | ||
| 2119 | CONFIG_VGASTATE=m | 2120 | CONFIG_VGASTATE=m |
| 2120 | CONFIG_VIDEO_OUTPUT_CONTROL=y | 2121 | CONFIG_VIDEO_OUTPUT_CONTROL=y |
| 2121 | CONFIG_FB=y | 2122 | 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 64deeeaf54..adc33b492a 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 | |||
| 6 | _DRM_AGP = 3, /**< AGP/GART */ | 6 | _DRM_AGP = 3, /**< AGP/GART */ |
| 7 | _DRM_SCATTER_GATHER = 4, /**< Scatter/gather memory for PCI DMA */ | 7 | _DRM_SCATTER_GATHER = 4, /**< Scatter/gather memory for PCI DMA */ |
| 8 | _DRM_CONSISTENT = 5, /**< Consistent memory for PCI DMA */ | 8 | _DRM_CONSISTENT = 5, /**< Consistent memory for PCI DMA */ |
| 9 | + _DRM_TTM = 6 | 9 | + _DRM_TTM = 7 |
| 10 | }; | 10 | }; |
| 11 | 11 | ||
| 12 | /** | 12 | /** |
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 685956a706..0033f651b3 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 @@ | |||
| 1 | require linux-moblin.inc | 1 | require linux-moblin.inc |
| 2 | 2 | ||
| 3 | PR = "r6" | 3 | PR = "r7" |
| 4 | PE = "1" | 4 | PE = "1" |
| 5 | 5 | ||
| 6 | DEFAULT_PREFERENCE = "-1" | 6 | DEFAULT_PREFERENCE = "-1" |
| @@ -54,6 +54,6 @@ SRC_URI = "${KERNELORG_MIRROR}pub/linux/kernel/v2.6/linux-2.6.27.tar.bz2 \ | |||
| 54 | file://defconfig-menlow \ | 54 | file://defconfig-menlow \ |
| 55 | file://defconfig-netbook" | 55 | file://defconfig-netbook" |
| 56 | 56 | ||
| 57 | SRC_URI_append_menlow = "psb-driver.patch;patch=1" | 57 | SRC_URI_append_menlow = " file://psb-driver.patch;patch=1" |
| 58 | 58 | ||
| 59 | S = "${WORKDIR}/linux-2.6.27" | 59 | S = "${WORKDIR}/linux-2.6.27" |
