On 30 December 2014 at 05:14, <sfel...@gmail.com> wrote: > From: Scott Feldman <sfel...@gmail.com> > > 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 <sfel...@gmail.com> > Signed-off-by: Jiri Pirko <j...@resnulli.us> > --- > docs/specs/pci-ids.txt | 2 +- > include/hw/pci/pci.h | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/docs/specs/pci-ids.txt b/docs/specs/pci-ids.txt > index 9b57d5e..c6732fe 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)
Paolo, do you know how we ended up with this double-allocation of PCI IDs? Who is the master authority for handing them out from this range? thanks -- PMM
