From: Pierre Ossman Sergey Vlasov wrote: >> diff --git a/include/linux/pci_regs.h b/include/linux/pci_regs.h >> index d27a78b..e6deda5 100644 >> --- a/include/linux/pci_regs.h >> +++ b/include/linux/pci_regs.h >> @@ -108,6 +108,9 @@ >> #define PCI_INTERRUPT_PIN 0x3d /* 8 bits */ >> #define PCI_MIN_GNT 0x3e /* 8 bits */ >> #define PCI_MAX_LAT 0x3f /* 8 bits */ >> +#define PCI_SLOT_INFO 0x40 /* 8 bits */ >> +#define PCI_SLOT_INFO_SLOTS(x) ((x >> 4) & 7) >> +#define PCI_SLOT_INFO_FIRST_BAR_MASK 0x07 > > Does this really belong here? This register is specific to the SDHCI > class, while all other definitions in pci_regs.h apply to all PCI > devices. > > drivers/mmc/sdhci.h seems to be a more logical place for SLOT_INFO > definitions. > Fixed here. (It will be added in a -fix patch for sdhci) Signed-off-by: Andrew Morton --- include/linux/pci_regs.h | 3 --- 1 files changed, 3 deletions(-) diff -puN include/linux/pci_regs.h~secure-digital-host-controller-id-and-regs-fix include/linux/pci_regs.h --- devel/include/linux/pci_regs.h~secure-digital-host-controller-id-and-regs-fix 2006-02-19 20:49:43.000000000 -0800 +++ devel-akpm/include/linux/pci_regs.h 2006-02-19 20:49:43.000000000 -0800 @@ -108,9 +108,6 @@ #define PCI_INTERRUPT_PIN 0x3d /* 8 bits */ #define PCI_MIN_GNT 0x3e /* 8 bits */ #define PCI_MAX_LAT 0x3f /* 8 bits */ -#define PCI_SLOT_INFO 0x40 /* 8 bits */ -#define PCI_SLOT_INFO_SLOTS(x) ((x >> 4) & 7) -#define PCI_SLOT_INFO_FIRST_BAR_MASK 0x07 /* Header type 1 (PCI-to-PCI bridges) */ #define PCI_PRIMARY_BUS 0x18 /* Primary bus number */ _