pci: move REDHAT_SDHCI device ID to make room for Rocker
authorScott Feldman <sfeldma@gmail.com>
Tue, 30 Dec 2014 05:14:02 +0000 (21:14 -0800)
committerPaolo Bonzini <pbonzini@redhat.com>
Sat, 3 Jan 2015 08:22:13 +0000 (09:22 +0100)
commit5aa8136020f47fbd38c458b9834c783cb7063db8
tree5c1fdede66299bc14dd72b011d082f288906d5e3
parentdebfb917a4f9c0784772c86f110f2bcd22e5a14f
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>
docs/specs/pci-ids.txt
include/hw/pci/pci.h