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
Makefile -rw-r--r-- 989 bytes
dvo.h -rw-r--r-- 4.5 KB
dvo_ch7017.c -rw-r--r-- 12.2 KB
dvo_ch7xxx.c -rw-r--r-- 7.5 KB
dvo_ivch.c -rw-r--r-- 9.8 KB
dvo_sil164.c -rw-r--r-- 6.3 KB
dvo_tfp410.c -rw-r--r-- 7.7 KB
i915_debugfs.c -rw-r--r-- 49.5 KB
i915_dma.c -rw-r--r-- 58.2 KB
i915_drv.c -rw-r--r-- 27.3 KB
i915_drv.h -rw-r--r-- 42.5 KB
i915_gem.c -rw-r--r-- 106.1 KB
i915_gem_debug.c -rw-r--r-- 5.5 KB
i915_gem_evict.c -rw-r--r-- 6.7 KB
i915_gem_execbuffer.c -rw-r--r-- 36.5 KB
i915_gem_gtt.c -rw-r--r-- 4.6 KB
i915_gem_tiling.c -rw-r--r-- 14.6 KB
i915_ioc32.c -rw-r--r-- 7.0 KB
i915_irq.c -rw-r--r-- 58.5 KB
i915_mem.c -rw-r--r-- 9.3 KB
i915_reg.h -rw-r--r-- 132.4 KB
i915_suspend.c -rw-r--r-- 28.8 KB
i915_trace.h -rw-r--r-- 10.1 KB
i915_trace_points.c -rw-r--r-- 183 bytes
intel_acpi.c -rw-r--r-- 5.8 KB
intel_bios.c -rw-r--r-- 19.4 KB
intel_bios.h -rw-r--r-- 16.9 KB
intel_crt.c -rw-r--r-- 16.5 KB
intel_display.c -rw-r--r-- 249.3 KB
intel_dp.c -rw-r--r-- 67.6 KB
intel_drv.h -rw-r--r-- 14.2 KB
intel_dvo.c -rw-r--r-- 12.7 KB
intel_fb.c -rw-r--r-- 7.4 KB
intel_hdmi.c -rw-r--r-- 15.4 KB
intel_i2c.c -rw-r--r-- 11.8 KB
intel_lvds.c -rw-r--r-- 30.4 KB
intel_modes.c -rw-r--r-- 3.8 KB
intel_opregion.c -rw-r--r-- 13.9 KB
intel_overlay.c -rw-r--r-- 40.0 KB
intel_panel.c -rw-r--r-- 10.3 KB
intel_ringbuffer.c -rw-r--r-- 38.9 KB
intel_ringbuffer.h -rw-r--r-- 5.9 KB
intel_sdvo.c -rw-r--r-- 78.5 KB
intel_sdvo_regs.h -rw-r--r-- 23.1 KB
intel_sprite.c -rw-r--r-- 18.2 KB
intel_tv.c -rw-r--r-- 46.5 KB

back to top