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

diff --cc drivers/pci/Makefile
index 147779831b1303da43f03f996920b3ce627140a6,96f4759f2bd31400afabc3d75cd0d1a48eace79c..1753020368909e1f8e770ef171ff7d7c1bf40437
--- 1/drivers/pci/Makefile
--- 2/drivers/pci/Makefile
+++ b/drivers/pci/Makefile
@@@ -4,17 -4,16 +4,17 @@@
  
  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 setup-irq.o
 +                                 setup-bus.o vc.o mmap.o devres.o
  
  obj-$(CONFIG_PCI)             += msi/
  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
  
  obj-$(CONFIG_OF)              += of.o

diff --cc drivers/pci/pci.h
Simple merge

diff --cc drivers/pci/probe.c
Simple merge