diff options
| author | Richard Purdie <rpurdie@linux.intel.com> | 2008-10-29 14:55:26 +0000 |
|---|---|---|
| committer | Richard Purdie <rpurdie@linux.intel.com> | 2008-10-29 14:55:26 +0000 |
| commit | e61ea24100067bdcd82be23607500d1acbcc91cb (patch) | |
| tree | 55433c486ae43889b43179a076624097e029ffb9 /meta/packages/xorg-driver/xf86-video-intel-dri2/002_avoid_duplicate_SaveHWState.patch | |
| parent | 3e7b691f60630bd224ab95374ddb5f3c108f645e (diff) | |
| parent | f21745fa921c1eacb9740ba4f08813a54be4ab8d (diff) | |
| download | openembedded-core-e61ea24100067bdcd82be23607500d1acbcc91cb.tar.gz openembedded-core-e61ea24100067bdcd82be23607500d1acbcc91cb.tar.bz2 openembedded-core-e61ea24100067bdcd82be23607500d1acbcc91cb.tar.xz openembedded-core-e61ea24100067bdcd82be23607500d1acbcc91cb.zip | |
Merge branch 'pli1/X11-rework' of git@moblin-mdi.jf.intel.com:poky-staging into master-dev
Diffstat (limited to 'meta/packages/xorg-driver/xf86-video-intel-dri2/002_avoid_duplicate_SaveHWState.patch')
| -rw-r--r--[-rwxr-xr-x] | meta/packages/xorg-driver/xf86-video-intel-dri2/002_avoid_duplicate_SaveHWState.patch | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/meta/packages/xorg-driver/xf86-video-intel-dri2/002_avoid_duplicate_SaveHWState.patch b/meta/packages/xorg-driver/xf86-video-intel-dri2/002_avoid_duplicate_SaveHWState.patch index 87c2a873e..12a980bbf 100755..100644 --- a/meta/packages/xorg-driver/xf86-video-intel-dri2/002_avoid_duplicate_SaveHWState.patch +++ b/meta/packages/xorg-driver/xf86-video-intel-dri2/002_avoid_duplicate_SaveHWState.patch @@ -1,7 +1,8 @@ -diff -urN xf86-video-intel-2.5.96.0/src/i830_driver.c xf86-video-intel-2.5.96.0.new/src/i830_driver.c ---- xf86-video-intel-2.5.96.0/src/i830_driver.c 2008-09-13 06:58:45.000000000 +0800 -+++ xf86-video-intel-2.5.96.0.new/src/i830_driver.c 2008-09-25 21:22:08.000000000 +0800 -@@ -1782,7 +1782,7 @@ +diff --git a/src/i830_driver.c b/src/i830_driver.c +index 7bc10fd..6cd30b2 100644 +--- a/src/i830_driver.c ++++ b/src/i830_driver.c +@@ -1792,7 +1792,7 @@ I830PreInit(ScrnInfoPtr pScrn, int flags) return FALSE; pI830 = I830PTR(pScrn); |