diff --git a/[refs] b/[refs]
index 8a0ca142b35e..268498fc14f3 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3343660d8c62c6b00b2f15324ef3fcb6be207bfa
+refs/heads/master: 55a7c066041e7850948d29ed813f62821a9ec046
diff --git a/trunk/drivers/virtio/virtio_pci.c b/trunk/drivers/virtio/virtio_pci.c
index 192687e3a56a..26f787ddd5ff 100644
--- a/trunk/drivers/virtio/virtio_pci.c
+++ b/trunk/drivers/virtio/virtio_pci.c
@@ -311,6 +311,12 @@ static int __devinit virtio_pci_probe(struct pci_dev *pci_dev,
 	if (pci_dev->device < 0x1000 || pci_dev->device > 0x103f)
 		return -ENODEV;
 
+	if (pci_dev->revision != VIRTIO_PCI_ABI_VERSION) {
+		printk(KERN_ERR "virtio_pci: expected ABI version %d, got %d\n",
+		       VIRTIO_PCI_ABI_VERSION, pci_dev->revision);
+		return -ENODEV;
+	}
+
 	/* allocate our structure and fill it out */
 	vp_dev = kzalloc(sizeof(struct virtio_pci_device), GFP_KERNEL);
 	if (vp_dev == NULL)
diff --git a/trunk/include/linux/virtio_pci.h b/trunk/include/linux/virtio_pci.h
index 860eb37bfa07..b3151659cf49 100644
--- a/trunk/include/linux/virtio_pci.h
+++ b/trunk/include/linux/virtio_pci.h
@@ -52,4 +52,6 @@
  * configuration space */
 #define VIRTIO_PCI_CONFIG		20
 
+/* Virtio ABI version, this must match exactly */
+#define VIRTIO_PCI_ABI_VERSION		0
 #endif