Fedora kernel-2.6.17-1.2142_FC4 patched with stable patch-2.6.17.4-vs2.0.2-rc26.diff

[linux-2.6.git] / drivers / video / intelfb / intelfbhw.c

diff --git a/drivers/video/intelfb/intelfbhw.c b/drivers/video/intelfb/intelfbhw.c
index df40108..624c4bc 100644 (file)
--- a/drivers/video/intelfb/intelfbhw.c
+++ b/drivers/video/intelfb/intelfbhw.c
@@ -29,16 +29,11 @@
 #include <linux/slab.h>
 #include <linux/delay.h>
 #include <linux/fb.h>
-#include <linux/console.h>
-#include <linux/selection.h>
 #include <linux/ioport.h>
 #include <linux/init.h>
 #include <linux/pci.h>
 #include <linux/vmalloc.h>
-#include <linux/kd.h>
-#include <linux/vt_kern.h>
 #include <linux/pagemap.h>
-#include <linux/version.h>
 
 #include <asm/io.h>
 
@@ -98,6 +93,16 @@ intelfbhw_get_chipset(struct pci_dev *pdev, const char **name, int *chipset,
                *chipset = INTEL_865G;
                *mobile = 0;
                return 0;
+       case PCI_DEVICE_ID_INTEL_915G:
+               *name = "Intel(R) 915G";
+               *chipset = INTEL_915G;
+               *mobile = 0;
+               return 0;
+       case PCI_DEVICE_ID_INTEL_915GM:
+               *name = "Intel(R) 915GM";
+               *chipset = INTEL_915GM;
+               *mobile = 1;
+               return 0;
        default:
                return 1;
        }
@@ -169,6 +174,12 @@ intelfbhw_get_memory(struct pci_dev *pdev, int *aperture_size,
                case INTEL_855_GMCH_GMS_STOLEN_32M:
                        *stolen_size = MB(32) - KB(132);
                        return 0;
+               case INTEL_915G_GMCH_GMS_STOLEN_48M:
+                       *stolen_size = MB(48) - KB(132);
+                       return 0;
+               case INTEL_915G_GMCH_GMS_STOLEN_64M:
+                       *stolen_size = MB(64) - KB(132);
+                       return 0;
                case INTEL_855_GMCH_GMS_DISABLED:
                        ERR_MSG("video memory is disabled\n");
                        return 0;