Merge master.kernel.org:/pub/scm/linux/kernel/git/davej/agpgart

* master.kernel.org:/pub/scm/linux/kernel/git/davej/agpgart:
  [AGPGART] Add new IDs to VIA AGP.
  [AGPGART] Remove pointless assignment.
  [AGPGART] Remove pointless typedef in ati-agp
  [AGPGART] Prevent (unlikely) memory leak in amd_create_gatt_pages()
  [AGPGART] intel_agp: restore graphics device's pci space early in resume

diff --combined include/linux/pci_ids.h
index e642b99f9a920c03ad9c7c5af1063039dc6e5f0f,083ad66e6528bcf87ce61cca9dd5fe9ab821d4c6..3d1d21035dec23ecfd981cfd07acb9bf07e1f16e
--- 1/include/linux/pci_ids.h
--- 2/include/linux/pci_ids.h
+++ b/include/linux/pci_ids.h
@@@ -104,10 -104,6 +104,10 @@@
  #define PCI_CLASS_SERIAL_FIBER                0x0c04
  #define PCI_CLASS_SERIAL_SMBUS                0x0c05
  
 +#define PCI_BASE_CLASS_WIRELESS                       0x0d
 +#define PCI_CLASS_WIRELESS_RF_CONTROLLER      0x0d10
 +#define PCI_CLASS_WIRELESS_WHCI                       0x0d1010
 +
  #define PCI_BASE_CLASS_INTELLIGENT    0x0e
  #define PCI_CLASS_INTELLIGENT_I2O     0x0e00
  
@@@ -1277,12 -1273,14 +1277,13 @@@
  #define PCI_DEVICE_ID_VIA_3296_0      0x0296
  #define PCI_DEVICE_ID_VIA_8363_0      0x0305
  #define PCI_DEVICE_ID_VIA_P4M800CE    0x0314
- #define PCI_DEVICE_ID_VIA_K8M890CE    0x0336
+ #define PCI_DEVICE_ID_VIA_P4M890      0x0327
+ #define PCI_DEVICE_ID_VIA_VT3336      0x0336
  #define PCI_DEVICE_ID_VIA_8371_0      0x0391
  #define PCI_DEVICE_ID_VIA_8501_0      0x0501
  #define PCI_DEVICE_ID_VIA_82C561      0x0561
  #define PCI_DEVICE_ID_VIA_82C586_1    0x0571
  #define PCI_DEVICE_ID_VIA_82C576      0x0576
 -#define PCI_DEVICE_ID_VIA_SATA_EIDE   0x0581
  #define PCI_DEVICE_ID_VIA_82C586_0    0x0586
  #define PCI_DEVICE_ID_VIA_82C596      0x0596
  #define PCI_DEVICE_ID_VIA_82C597_0    0x0597
@@@ -1325,8 -1323,6 +1326,8 @@@
  #define PCI_DEVICE_ID_VIA_8237                0x3227
  #define PCI_DEVICE_ID_VIA_8251                0x3287
  #define PCI_DEVICE_ID_VIA_8237A               0x3337
 +#define PCI_DEVICE_ID_VIA_8237S               0x3372
 +#define PCI_DEVICE_ID_VIA_SATA_EIDE   0x5324
  #define PCI_DEVICE_ID_VIA_8231                0x8231
  #define PCI_DEVICE_ID_VIA_8231_4      0x8235
  #define PCI_DEVICE_ID_VIA_8365_1      0x8305