From e4e9509f8198f084d5181f473d5beebf6d5a349d Mon Sep 17 00:00:00 2001 From: Lennert Buytenhek Date: Wed, 21 Nov 2007 15:07:07 -0800 Subject: [PATCH] --- yaml --- r: 82311 b: refs/heads/master c: 10d7425d201e866ee0c57424860e06118dae2500 h: refs/heads/master i: 82309: a328106638947625265749e832051c28be599d76 82307: 3ae4295ef3bf20a4747a8299b183494891c8582f 82303: e8e7fce6eb94ea72c0b0f88f144c5d49f4e38391 v: v3 --- [refs] | 2 +- trunk/include/linux/pci.h | 5 ----- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/[refs] b/[refs] index 6dc4f180dbf0..80a18089e07c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 74e27e44b0407fb1f6e8d1f7b7818f108463c4b8 +refs/heads/master: 10d7425d201e866ee0c57424860e06118dae2500 diff --git a/trunk/include/linux/pci.h b/trunk/include/linux/pci.h index bdff18b7fbc6..c53d6cf723d1 100644 --- a/trunk/include/linux/pci.h +++ b/trunk/include/linux/pci.h @@ -66,7 +66,6 @@ enum pci_mmap_state { #define PCI_DMA_FROMDEVICE 2 #define PCI_DMA_NONE 3 -#define DEVICE_COUNT_COMPATIBLE 4 #define DEVICE_COUNT_RESOURCE 12 typedef int __bitwise pci_power_t; @@ -167,10 +166,6 @@ struct pci_dev { pci_channel_state_t error_state; /* current connectivity state */ struct device dev; /* Generic device interface */ - /* device is compatible with these IDs */ - unsigned short vendor_compatible[DEVICE_COUNT_COMPATIBLE]; - unsigned short device_compatible[DEVICE_COUNT_COMPATIBLE]; - int cfg_size; /* Size of configuration space */ /*