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
gameport
joystick
keyboard
misc
mouse
serio
tablet
touchscreen
Kconfig -rw-r--r-- 5.3 KB
Makefile -rw-r--r-- 783 bytes
apm-power.c -rw-r--r-- 2.6 KB
evbug.c -rw-r--r-- 3.1 KB
evdev.c -rw-r--r-- 22.6 KB
ff-core.c -rw-r--r-- 8.9 KB
ff-memless.c -rw-r--r-- 14.2 KB
fixp-arith.h -rw-r--r-- 2.2 KB
input-compat.c -rw-r--r-- 3.2 KB
input-compat.h -rw-r--r-- 2.1 KB
input-mt.c -rw-r--r-- 5.1 KB
input-polldev.c -rw-r--r-- 6.2 KB
input.c -rw-r--r-- 52.3 KB
joydev.c -rw-r--r-- 22.6 KB
mousedev.c -rw-r--r-- 25.8 KB
sparse-keymap.c -rw-r--r-- 8.6 KB

back to top