diff options
| author | Scott Feldman <sfeldma@gmail.com> | 2014-12-29 21:14:02 -0800 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2015-01-03 09:22:13 +0100 |
| commit | 5aa8136020f47fbd38c458b9834c783cb7063db8 (patch) | |
| tree | 5c1fdede66299bc14dd72b011d082f288906d5e3 /include/hw/pci/pci.h | |
| parent | debfb917a4f9c0784772c86f110f2bcd22e5a14f (diff) | |
| download | focaccia-qemu-5aa8136020f47fbd38c458b9834c783cb7063db8.tar.gz focaccia-qemu-5aa8136020f47fbd38c458b9834c783cb7063db8.zip | |
pci: move REDHAT_SDHCI device ID to make room for Rocker
The rocker device uses same PCI device ID as sdhci. Since rocker device driver has already been accepted into Linux 3.18, and REDHAT_SDHCI device ID isn't used by any drivers, it's safe to move REDHAT_SDHCI device ID, avoiding conflict with rocker. Signed-off-by: Scott Feldman <sfeldma@gmail.com> Signed-off-by: Jiri Pirko <jiri@resnulli.us> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Diffstat (limited to 'include/hw/pci/pci.h')
| -rw-r--r-- | include/hw/pci/pci.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/hw/pci/pci.h b/include/hw/pci/pci.h index 97e4257ac0..97a83d362f 100644 --- a/include/hw/pci/pci.h +++ b/include/hw/pci/pci.h @@ -88,7 +88,7 @@ #define PCI_DEVICE_ID_REDHAT_SERIAL2 0x0003 #define PCI_DEVICE_ID_REDHAT_SERIAL4 0x0004 #define PCI_DEVICE_ID_REDHAT_TEST 0x0005 -#define PCI_DEVICE_ID_REDHAT_SDHCI 0x0006 +#define PCI_DEVICE_ID_REDHAT_SDHCI 0x0007 #define PCI_DEVICE_ID_REDHAT_QXL 0x0100 #define FMT_PCIBUS PRIx64 |