Merge branch 'topic/quirk-cleanup' into topic/hda

diff --combined include/linux/pci_ids.h
index 6b339766b7ad323b8ad4a437bc509638fafca30c,febc10ed3858a474a5d1edf12c8759e133af4fe1..88152e50d063588ebbda9d33595011629acfe7e4
--- 1/include/linux/pci_ids.h
--- 2/include/linux/pci_ids.h
+++ b/include/linux/pci_ids.h
@@@ -1357,6 -1357,7 +1357,7 @@@
  #define PCI_DEVICE_ID_VIA_8783_0      0x3208
  #define PCI_DEVICE_ID_VIA_8237                0x3227
  #define PCI_DEVICE_ID_VIA_8251                0x3287
+ #define PCI_DEVICE_ID_VIA_8261                0x3402
  #define PCI_DEVICE_ID_VIA_8237A               0x3337
  #define PCI_DEVICE_ID_VIA_8237S               0x3372
  #define PCI_DEVICE_ID_VIA_SATA_EIDE   0x5324
@@@ -1366,10 -1367,13 +1367,13 @@@
  #define PCI_DEVICE_ID_VIA_CX700               0x8324
  #define PCI_DEVICE_ID_VIA_CX700_IDE   0x0581
  #define PCI_DEVICE_ID_VIA_VX800               0x8353
+ #define PCI_DEVICE_ID_VIA_VX855               0x8409
  #define PCI_DEVICE_ID_VIA_8371_1      0x8391
  #define PCI_DEVICE_ID_VIA_82C598_1    0x8598
  #define PCI_DEVICE_ID_VIA_838X_1      0xB188
  #define PCI_DEVICE_ID_VIA_83_87XX_1   0xB198
+ #define PCI_DEVICE_ID_VIA_C409_IDE    0XC409
+ #define PCI_DEVICE_ID_VIA_ANON                0xFFFF
  
  #define PCI_VENDOR_ID_SIEMENS           0x110A
  #define PCI_DEVICE_ID_SIEMENS_DSCC4     0x2102
@@@ -2106,8 -2110,6 +2110,8 @@@
  #define PCI_DEVICE_ID_MELLANOX_SINAI_OLD 0x5e8c
  #define PCI_DEVICE_ID_MELLANOX_SINAI  0x6274
  
 +#define PCI_VENDOR_ID_DFI             0x15bd
 +
  #define PCI_VENDOR_ID_QUICKNET                0x15e2
  #define PCI_DEVICE_ID_QUICKNET_XJ     0x0500
  
@@@ -2176,6 -2178,7 +2180,7 @@@
  #define PCI_DEVICE_ID_RDC_R6040               0x6040
  #define PCI_DEVICE_ID_RDC_R6060               0x6060
  #define PCI_DEVICE_ID_RDC_R6061               0x6061
+ #define PCI_DEVICE_ID_RDC_D1010               0x1010
  
  #define PCI_VENDOR_ID_LENOVO          0x17aa