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
File | Mode | Size |
---|---|---|
Kconfig | -rw-r--r-- | 1.8 KB |
Makefile | -rw-r--r-- | 354 bytes |
ds1wm.c | -rw-r--r-- | 15.3 KB |
ds2482.c | -rw-r--r-- | 13.1 KB |
ds2490.c | -rw-r--r-- | 23.4 KB |
matrox_w1.c | -rw-r--r-- | 5.9 KB |
mxc_w1.c | -rw-r--r-- | 5.0 KB |
omap_hdq.c | -rw-r--r-- | 17.8 KB |
w1-gpio.c | -rw-r--r-- | 3.3 KB |
Computing file changes ...