summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorStephen Rothwell <sfr@canb.auug.org.au>2010-07-23 12:40:09 +1000
committerStephen Rothwell <sfr@canb.auug.org.au>2010-07-23 12:40:09 +1000
commit817573d20be60ae8bc2a84066c699196680c973b (patch)
treef460165b62f76dfc69a5bebf5a7a2e14c8204b8e /include
parentd6d5413c4ca8e18dd6bb77e4b1260719de0253c2 (diff)
parentc6ebacc1eb165bd636fac860cb78c6c633285b7b (diff)
Merge remote branch 'watchdog/master'
Diffstat (limited to 'include')
-rw-r--r--include/linux/pci_ids.h3
1 files changed, 3 insertions, 0 deletions
diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h
index 3bedcc149c84..55fd4ebfa0f8 100644
--- a/include/linux/pci_ids.h
+++ b/include/linux/pci_ids.h
@@ -2369,6 +2369,9 @@
#define PCI_VENDOR_ID_AKS 0x416c
#define PCI_DEVICE_ID_AKS_ALADDINCARD 0x0100
+#define PCI_VENDOR_ID_ACCESSIO 0x494f
+#define PCI_DEVICE_ID_ACCESSIO_WDG_CSM 0x22c0
+
#define PCI_VENDOR_ID_S3 0x5333
#define PCI_DEVICE_ID_S3_TRIO 0x8811
#define PCI_DEVICE_ID_S3_868 0x8880