diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-11-09 07:07:12 +0100 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-11-09 07:07:12 +0100 |
| commit | a892acacd3a8546ac161526522f13b5174f2c471 (patch) | |
| tree | ee6d36f27f1388989ebfcabf90253fb7194112ac /drivers/video/intelfb/intelfbhw.c | |
| parent | [libata] eliminate use of drivers/scsi/scsi.h compatibility header/defines (diff) | |
| parent | [PATCH] Fix sysctl unregistration oops (CVE-2005-2709) (diff) | |
| download | linux-a892acacd3a8546ac161526522f13b5174f2c471.tar.xz linux-a892acacd3a8546ac161526522f13b5174f2c471.zip | |
Merge branch 'master'
Diffstat (limited to 'drivers/video/intelfb/intelfbhw.c')
| -rw-r--r-- | drivers/video/intelfb/intelfbhw.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/video/intelfb/intelfbhw.c b/drivers/video/intelfb/intelfbhw.c index 5bafc3c54db7..ac94c2e5ff85 100644 --- a/drivers/video/intelfb/intelfbhw.c +++ b/drivers/video/intelfb/intelfbhw.c @@ -99,6 +99,11 @@ intelfbhw_get_chipset(struct pci_dev *pdev, const char **name, int *chipset, *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; } |