diff options
| author | Ilpo Järvinen <ilpo.jarvinen@linux.intel.com> | 2025-03-11 19:47:01 +0200 |
|---|---|---|
| committer | Bjorn Helgaas <bhelgaas@google.com> | 2025-03-20 16:44:26 -0500 |
| commit | cc7a371b0bf5e507b24c5a595068dfb4e2b3445b (patch) | |
| tree | 4d2418074b1597a83cf35e8e1c5518db84c59016 | |
| parent | 2f255e299c676cbae4b0d164a497a0553b86845a (diff) | |
PCI: Move cardbus IO size declarations into pci/pci.h
For some reason, cardbus related io/mem size declarations are in
linux/pci.h, whereas non-cardbus sizes are already in pci/pci.h.
Move all them into one place in pci/pci.h.
Link: https://lore.kernel.org/r/20250311174701.3586-4-ilpo.jarvinen@linux.intel.com
Signed-off-by: Ilpo Järvinen <ilpo.jarvinen@linux.intel.com>
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
| -rw-r--r-- | drivers/pci/pci.h | 2 | ||||
| -rw-r--r-- | include/linux/pci.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/pci/pci.h b/drivers/pci/pci.h index 1b6081fa3ecd..ad247c5f794d 100644 --- a/drivers/pci/pci.h +++ b/drivers/pci/pci.h @@ -266,6 +266,8 @@ extern unsigned long pci_hotplug_io_size; extern unsigned long pci_hotplug_mmio_size; extern unsigned long pci_hotplug_mmio_pref_size; extern unsigned long pci_hotplug_bus_size; +extern unsigned long pci_cardbus_io_size; +extern unsigned long pci_cardbus_mem_size; /** * pci_match_one_device - Tell if a PCI device structure has a matching diff --git a/include/linux/pci.h b/include/linux/pci.h index 9a703355ef06..f9424478a19a 100644 --- a/include/linux/pci.h +++ b/include/linux/pci.h @@ -2332,8 +2332,6 @@ extern int pci_pci_problems; #define PCIPCI_ALIMAGIK 32 /* Need low latency setting */ #define PCIAGP_FAIL 64 /* No PCI to AGP DMA */ -extern unsigned long pci_cardbus_io_size; -extern unsigned long pci_cardbus_mem_size; extern u8 pci_dfl_cache_line_size; extern u8 pci_cache_line_size; |