Merge branch 'agp-patches' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied...

* '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()

diff --combined include/linux/pci_ids.h
index f77944e432f2d10aca19cc68a92d02f9d2f95df7,0d58a39017dea9dedcb6b00c4c4d9765c849b92e..06d23e10a16d4679ae860c63fedf566de4555bce
--- 1/include/linux/pci_ids.h
--- 2/include/linux/pci_ids.h
+++ b/include/linux/pci_ids.h
@@@ -360,9 -360,6 +360,9 @@@
  #define PCI_DEVICE_ID_ATI_RS400_166     0x5a32
  #define PCI_DEVICE_ID_ATI_RS400_200     0x5a33
  #define PCI_DEVICE_ID_ATI_RS480         0x5950
 +#define PCI_DEVICE_ID_ATI_RD580               0x5952
 +#define PCI_DEVICE_ID_ATI_RX790               0x5957
 +#define PCI_DEVICE_ID_ATI_RS690               0x7910
  /* ATI IXP Chipset */
  #define PCI_DEVICE_ID_ATI_IXP200_IDE  0x4349
  #define PCI_DEVICE_ID_ATI_IXP200_SMBUS        0x4353
@@@ -1290,6 -1287,7 +1290,7 @@@
  #define PCI_DEVICE_ID_VIA_VT3324      0x0324
  #define PCI_DEVICE_ID_VIA_VT3336      0x0336
  #define PCI_DEVICE_ID_VIA_VT3351      0x0351
+ #define PCI_DEVICE_ID_VIA_VT3364      0x0364
  #define PCI_DEVICE_ID_VIA_8371_0      0x0391
  #define PCI_DEVICE_ID_VIA_8501_0      0x0501
  #define PCI_DEVICE_ID_VIA_82C561      0x0561
@@@ -2095,10 -2093,8 +2096,10 @@@
  #define PCI_DEVICE_ID_MPC8568         0x0021
  #define PCI_DEVICE_ID_MPC8567E                0x0022
  #define PCI_DEVICE_ID_MPC8567         0x0023
 -#define PCI_DEVICE_ID_MPC8544E                0x0030
 -#define PCI_DEVICE_ID_MPC8544         0x0031
 +#define PCI_DEVICE_ID_MPC8533E                0x0030
 +#define PCI_DEVICE_ID_MPC8533         0x0031
 +#define PCI_DEVICE_ID_MPC8544E                0x0032
 +#define PCI_DEVICE_ID_MPC8544         0x0033
  #define PCI_DEVICE_ID_MPC8641         0x7010
  #define PCI_DEVICE_ID_MPC8641D                0x7011