From 04793894d4f0f2e657f7b0c61b850220c5c06281 Mon Sep 17 00:00:00 2001 From: Andriy Gapon Date: Thu, 17 Sep 2009 12:41:27 +0000 Subject: MFC r197077: pci: remove definitions of duplicate constants Suggested by: jhb Reviewed by: jhb Approved by: re (kib) --- sys/dev/pci/pcireg.h | 10 +++++----- sys/dev/pci/pcivar.h | 7 ------- 2 files changed, 5 insertions(+), 12 deletions(-) (limited to 'sys/dev') diff --git a/sys/dev/pci/pcireg.h b/sys/dev/pci/pcireg.h index c35214770856..c7a7245bf1d3 100644 --- a/sys/dev/pci/pcireg.h +++ b/sys/dev/pci/pcireg.h @@ -39,11 +39,11 @@ */ /* some PCI bus constants */ - -#define PCI_BUSMAX 255 -#define PCI_SLOTMAX 31 -#define PCI_FUNCMAX 7 -#define PCI_REGMAX 255 +#define PCI_DOMAINMAX 65535 /* highest supported domain number */ +#define PCI_BUSMAX 255 /* highest supported bus number */ +#define PCI_SLOTMAX 31 /* highest supported slot number */ +#define PCI_FUNCMAX 7 /* highest supported function number */ +#define PCI_REGMAX 255 /* highest supported config register addr. */ #define PCI_MAXHDRTYPE 2 /* PCI config header registers for all devices */ diff --git a/sys/dev/pci/pcivar.h b/sys/dev/pci/pcivar.h index 36ae2134d3b3..d7de96e65625 100644 --- a/sys/dev/pci/pcivar.h +++ b/sys/dev/pci/pcivar.h @@ -33,13 +33,6 @@ #include /* some PCI bus constants */ - -#define PCI_DOMAINMAX 65535 /* highest supported domain number */ -#define PCI_BUSMAX 255 /* highest supported bus number */ -#define PCI_SLOTMAX 31 /* highest supported slot number */ -#define PCI_FUNCMAX 7 /* highest supported function number */ -#define PCI_REGMAX 255 /* highest supported config register addr. */ - #define PCI_MAXMAPS_0 6 /* max. no. of memory/port maps */ #define PCI_MAXMAPS_1 2 /* max. no. of maps for PCI to PCI bridge */ #define PCI_MAXMAPS_2 1 /* max. no. of maps for CardBus bridge */ -- cgit v1.3