diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-08-25 11:01:53 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-08-25 11:01:53 -0400 |
| commit | 6ae26fa468533c86aaa6936fd366142fcf01386f (patch) | |
| tree | e1b5df138d0a3775b6546f2437950eb4fd635d6a /include/linux | |
| parent | 6869ce1c145aaea9f9f8eb8623a261d316b0cd19 (diff) | |
| parent | 5bdbc7dc2c07d507b41bffdadc2c8cc13b2d4326 (diff) | |
Merge branch 'agp-patches' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/agp-2.6
* 'agp-patches' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/agp-2.6:
agp: balance ioremap checks
agp: Add device id for P4M900 to via-agp module
efficeon-agp leaks 'struct agp_bridge_data' in error paths of agp_efficeon_probe()
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/pci_ids.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h index f77944e432f2..06d23e10a16d 100644 --- a/include/linux/pci_ids.h +++ b/include/linux/pci_ids.h | |||
| @@ -1290,6 +1290,7 @@ | |||
| 1290 | #define PCI_DEVICE_ID_VIA_VT3324 0x0324 | 1290 | #define PCI_DEVICE_ID_VIA_VT3324 0x0324 |
| 1291 | #define PCI_DEVICE_ID_VIA_VT3336 0x0336 | 1291 | #define PCI_DEVICE_ID_VIA_VT3336 0x0336 |
| 1292 | #define PCI_DEVICE_ID_VIA_VT3351 0x0351 | 1292 | #define PCI_DEVICE_ID_VIA_VT3351 0x0351 |
| 1293 | #define PCI_DEVICE_ID_VIA_VT3364 0x0364 | ||
| 1293 | #define PCI_DEVICE_ID_VIA_8371_0 0x0391 | 1294 | #define PCI_DEVICE_ID_VIA_8371_0 0x0391 |
| 1294 | #define PCI_DEVICE_ID_VIA_8501_0 0x0501 | 1295 | #define PCI_DEVICE_ID_VIA_8501_0 0x0501 |
| 1295 | #define PCI_DEVICE_ID_VIA_82C561 0x0561 | 1296 | #define PCI_DEVICE_ID_VIA_82C561 0x0561 |