aboutsummaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorScott Feldman <sfeldma@gmail.com>2014-12-29 21:14:02 -0800
committerPaolo Bonzini <pbonzini@redhat.com>2015-01-03 09:22:13 +0100
commit5aa8136020f47fbd38c458b9834c783cb7063db8 (patch)
tree5c1fdede66299bc14dd72b011d082f288906d5e3 /docs
parentdebfb917a4f9c0784772c86f110f2bcd22e5a14f (diff)
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 'docs')
-rw-r--r--docs/specs/pci-ids.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/docs/specs/pci-ids.txt b/docs/specs/pci-ids.txt
index 9b57d5e8fe..c6732fe003 100644
--- a/docs/specs/pci-ids.txt
+++ b/docs/specs/pci-ids.txt
@@ -45,7 +45,7 @@ PCI devices (other than virtio):
1b36:0003 PCI Dual-port 16550A adapter (docs/specs/pci-serial.txt)
1b36:0004 PCI Quad-port 16550A adapter (docs/specs/pci-serial.txt)
1b36:0005 PCI test device (docs/specs/pci-testdev.txt)
-1b36:0006 PCI SD Card Host Controller Interface (SDHCI)
+1b36:0007 PCI SD Card Host Controller Interface (SDHCI)
All these devices are documented in docs/specs.