diff options
| author | Bjorn Helgaas <bhelgaas@google.com> | 2024-03-12 12:14:23 -0500 |
|---|---|---|
| committer | Bjorn Helgaas <bhelgaas@google.com> | 2024-03-12 12:14:23 -0500 |
| commit | b8de187056f10f31739cad3d7b66677415f79883 (patch) | |
| tree | d1af8073803863d345d3b3d79e1cfca884e6a5be /drivers/pci/Makefile | |
| parent | 598b08b7752fe6b9de86333a8ec64997a5b5cff4 (diff) | |
| parent | f6c73999837820f98519bf0146df44e58f20f89c (diff) | |
| download | linux-stable-b8de187056f10f31739cad3d7b66677415f79883.tar.gz linux-stable-b8de187056f10f31739cad3d7b66677415f79883.tar.bz2 linux-stable-b8de187056f10f31739cad3d7b66677415f79883.zip | |
Merge branch 'pci/sysfs'
- Compile pci-sysfs.c only if CONFIG_SYSFS=y, which reduces kernel size by
~120KB when it's disabled (Lukas Wunner)
- Remove obsolete pci_cleanup_rom() declaration (Lukas Wunner)
- Rework pci_dev_resource_resize_attr(n) macros to call a function instead
of duplicating most of the body, which saves about 2.5KB of text (Ilpo
Järvinen)
* pci/sysfs:
PCI/sysfs: Demacrofy pci_dev_resource_resize_attr(n) functions
PCI: Remove obsolete pci_cleanup_rom() declaration
PCI/sysfs: Compile pci-sysfs.c only if CONFIG_SYSFS=y
# Conflicts:
# drivers/pci/Makefile
Diffstat (limited to 'drivers/pci/Makefile')
| -rw-r--r-- | drivers/pci/Makefile | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/pci/Makefile b/drivers/pci/Makefile index 147779831b13..175302036890 100644 --- a/drivers/pci/Makefile +++ b/drivers/pci/Makefile @@ -4,7 +4,7 @@ obj-$(CONFIG_PCI) += access.o bus.o probe.o host-bridge.o \ remove.o pci.o pci-driver.o search.o \ - pci-sysfs.o rom.o setup-res.o irq.o vpd.o \ + rom.o setup-res.o irq.o vpd.o \ setup-bus.o vc.o mmap.o devres.o obj-$(CONFIG_PCI) += msi/ @@ -12,7 +12,7 @@ obj-$(CONFIG_PCI) += pcie/ ifdef CONFIG_PCI obj-$(CONFIG_PROC_FS) += proc.o -obj-$(CONFIG_SYSFS) += slot.o +obj-$(CONFIG_SYSFS) += pci-sysfs.o slot.o obj-$(CONFIG_ACPI) += pci-acpi.o obj-$(CONFIG_GENERIC_PCI_IOMAP) += iomap.o endif |