rpms/kernel/F-11 drm-no-gem-on-i8xx.patch, 1.5, 1.6 kernel.spec, 1.1703, 1.1704

[Kyle McMartin]

Author: kyle

Update of /cvs/pkgs/rpms/kernel/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15449

Modified Files:
	drm-no-gem-on-i8xx.patch kernel.spec 
Log Message:
fix build

drm-no-gem-on-i8xx.patch:
 i915_dma.c |    4 ++--
 i915_drv.h |    3 +++
 2 files changed, 5 insertions(+), 2 deletions(-)

Index: drm-no-gem-on-i8xx.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-11/drm-no-gem-on-i8xx.patch,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- drm-no-gem-on-i8xx.patch	12 Aug 2009 17:24:58 -0000	1.5
+++ drm-no-gem-on-i8xx.patch	12 Aug 2009 20:28:48 -0000	1.6
@@ -21,7 +21,7 @@ index c431fa5..dcf5257 100644
  #define IS_I855(dev) ((dev)->pci_device == 0x3582)
  #define IS_I865G(dev) ((dev)->pci_device == 0x2572)
  
-+#define IS_8XX(dev) (IS_I830(dev) || IS_I845G(dev) || IS_I85X(dev) ||	\
++#define IS_8XX(dev) (IS_I830(dev) || IS_845G(dev) || IS_I85X(dev) ||	\
 +			IS_I855(dev))
 +
  #define IS_I915G(dev) ((dev)->pci_device == 0x2582 || (dev)->pci_device == 0x258a)


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-11/kernel.spec,v
retrieving revision 1.1703
retrieving revision 1.1704
diff -u -p -r1.1703 -r1.1704
--- kernel.spec	12 Aug 2009 17:24:58 -0000	1.1703
+++ kernel.spec	12 Aug 2009 20:28:48 -0000	1.1704
@@ -1898,7 +1898,7 @@ fi
 
 %changelog
 * Wed Aug 12 2009 Kyle McMartin <kyle at redhat.com>
-- drm-no-gem-on-i8xx.patch: fix misspelled IS_8XX.
+- drm-no-gem-on-i8xx.patch: fix misspelled IS_8XX & IS_I845G, sigh.
 
 * Wed Aug 12 2009 Kyle McMartin <kyle at redhat.com>
 - DRM patch sync-up with F-11-2.6.29.y, ABI probably isn't right yet though...