Revision e23e8c0690d2952dce53e712d01d5b2179f98b64 authored by Myron Stowe on 07 February 2012, 22:26:44 UTC, committed by Russell King on 21 February 2012, 09:35:32 UTC
The patch series to re-factor PCI's 'latency timer' setup (re:
http://marc.info/?l=linux-kernel&m=131983853831049&w=2) forgot to
remove the ARM specific definition of 'pcibios_max_latency' once such
had been moved into the pci core resulting in ARM related compile
errors -
  drivers/built-in.o:(.data+0x230): multiple definition of
  `pcibios_max_latency'
  arch/arm/common/built-in.o:(.data+0x40c): first defined here
  make[1]: *** [vmlinux.o] Error 1

In the series, patch 2/16 (commit 168c8619fd8) converted the ARM
specific version of 'pcibios_set_master()' to a non-inlined version.
This was done in preperation for hosting it up into PCI's core, which
was done in patch 10/16 (commit 96c5590058d) of the series (and
where the removal of ARM's 'pcibios_max_latency' was overlooked).

Reported-by: Russell King <rmk+kernel@arm.linux.org.uk>
Signed-off-by: Myron Stowe <myron.stowe@redhat.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
1 parent 910ba59
History
File Mode Size
acpica
apei
Kconfig -rw-r--r-- 12.2 KB
Makefile -rw-r--r-- 1.9 KB
ac.c -rw-r--r-- 9.2 KB
acpi_ipmi.c -rw-r--r-- 14.4 KB
acpi_memhotplug.c -rw-r--r-- 14.6 KB
acpi_pad.c -rw-r--r-- 13.4 KB
battery.c -rw-r--r-- 31.3 KB
blacklist.c -rw-r--r-- 8.9 KB
bus.c -rw-r--r-- 25.2 KB
button.c -rw-r--r-- 12.2 KB
cm_sbs.c -rw-r--r-- 3.0 KB
container.c -rw-r--r-- 6.9 KB
custom_method.c -rw-r--r-- 2.0 KB
debugfs.c -rw-r--r-- 406 bytes
dock.c -rw-r--r-- 27.8 KB
ec.c -rw-r--r-- 27.1 KB
ec_sys.c -rw-r--r-- 3.3 KB
event.c -rw-r--r-- 6.8 KB
fan.c -rw-r--r-- 5.7 KB
glue.c -rw-r--r-- 5.9 KB
hed.c -rw-r--r-- 2.8 KB
internal.h -rw-r--r-- 3.2 KB
numa.c -rw-r--r-- 8.4 KB
nvs.c -rw-r--r-- 4.6 KB
osl.c -rw-r--r-- 36.9 KB
pci_bind.c -rw-r--r-- 3.1 KB
pci_irq.c -rw-r--r-- 14.0 KB
pci_link.c -rw-r--r-- 23.1 KB
pci_root.c -rw-r--r-- 17.2 KB
pci_slot.c -rw-r--r-- 10.1 KB
power.c -rw-r--r-- 16.0 KB
proc.c -rw-r--r-- 10.7 KB
processor_core.c -rw-r--r-- 8.9 KB
processor_driver.c -rw-r--r-- 23.4 KB
processor_idle.c -rw-r--r-- 32.3 KB
processor_perflib.c -rw-r--r-- 19.3 KB
processor_thermal.c -rw-r--r-- 6.2 KB
processor_throttling.c -rw-r--r-- 31.6 KB
reboot.c -rw-r--r-- 1.3 KB
sbs.c -rw-r--r-- 28.5 KB
sbshc.c -rw-r--r-- 7.9 KB
sbshc.h -rw-r--r-- 960 bytes
scan.c -rw-r--r-- 39.2 KB
sleep.c -rw-r--r-- 22.1 KB
sleep.h -rw-r--r-- 239 bytes
sysfs.c -rw-r--r-- 18.5 KB
tables.c -rw-r--r-- 10.0 KB
thermal.c -rw-r--r-- 29.4 KB
utils.c -rw-r--r-- 9.2 KB
video.c -rw-r--r-- 45.7 KB
video_detect.c -rw-r--r-- 7.3 KB
wakeup.c -rw-r--r-- 2.7 KB

back to top