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 |
---|---|---|
88pm860x-ts.c | -rw-r--r-- | 5.9 KB |
Kconfig | -rw-r--r-- | 21.0 KB |
Makefile | -rw-r--r-- | 3.0 KB |
ad7877.c | -rw-r--r-- | 21.1 KB |
ad7879-i2c.c | -rw-r--r-- | 2.6 KB |
ad7879-spi.c | -rw-r--r-- | 3.9 KB |
ad7879.c | -rw-r--r-- | 15.4 KB |
ad7879.h | -rw-r--r-- | 677 bytes |
ads7846.c | -rw-r--r-- | 33.6 KB |
atmel-wm97xx.c | -rw-r--r-- | 11.6 KB |
atmel_mxt_ts.c | -rw-r--r-- | 29.1 KB |
atmel_tsadcc.c | -rw-r--r-- | 11.1 KB |
auo-pixcir-ts.c | -rw-r--r-- | 15.8 KB |
bu21013_ts.c | -rw-r--r-- | 17.7 KB |
cy8ctmg110_ts.c | -rw-r--r-- | 8.5 KB |
da9034-ts.c | -rw-r--r-- | 8.7 KB |
dynapro.c | -rw-r--r-- | 4.8 KB |
eeti_ts.c | -rw-r--r-- | 7.9 KB |
egalax_ts.c | -rw-r--r-- | 7.1 KB |
elo.c | -rw-r--r-- | 8.9 KB |
fujitsu_ts.c | -rw-r--r-- | 4.2 KB |
gunze.c | -rw-r--r-- | 4.8 KB |
h3600_ts_input.c | -rw-r--r-- | 12.6 KB |
hampshire.c | -rw-r--r-- | 5.0 KB |
hp680_ts_input.c | -rw-r--r-- | 2.9 KB |
htcpen.c | -rw-r--r-- | 5.7 KB |
inexio.c | -rw-r--r-- | 4.8 KB |
intel-mid-touch.c | -rw-r--r-- | 15.1 KB |
jornada720_ts.c | -rw-r--r-- | 4.5 KB |
lpc32xx_ts.c | -rw-r--r-- | 10.1 KB |
mainstone-wm97xx.c | -rw-r--r-- | 7.5 KB |
max11801_ts.c | -rw-r--r-- | 7.5 KB |
mc13783_ts.c | -rw-r--r-- | 6.7 KB |
mcs5000_ts.c | -rw-r--r-- | 8.4 KB |
migor_ts.c | -rw-r--r-- | 6.3 KB |
mk712.c | -rw-r--r-- | 5.7 KB |
mtouch.c | -rw-r--r-- | 5.2 KB |
pcap_ts.c | -rw-r--r-- | 6.6 KB |
penmount.c | -rw-r--r-- | 7.1 KB |
pixcir_i2c_ts.c | -rw-r--r-- | 5.8 KB |
s3c2410_ts.c | -rw-r--r-- | 10.9 KB |
st1232.c | -rw-r--r-- | 6.5 KB |
stmpe-ts.c | -rw-r--r-- | 9.5 KB |
tnetv107x-ts.c | -rw-r--r-- | 9.2 KB |
touchit213.c | -rw-r--r-- | 5.9 KB |
touchright.c | -rw-r--r-- | 4.1 KB |
touchwin.c | -rw-r--r-- | 4.3 KB |
tps6507x-ts.c | -rw-r--r-- | 8.5 KB |
tsc2005.c | -rw-r--r-- | 18.3 KB |
tsc2007.c | -rw-r--r-- | 9.8 KB |
tsc40.c | -rw-r--r-- | 3.8 KB |
ucb1400_ts.c | -rw-r--r-- | 12.3 KB |
usbtouchscreen.c | -rw-r--r-- | 40.0 KB |
w90p910_ts.c | -rw-r--r-- | 8.4 KB |
wacom_w8001.c | -rw-r--r-- | 14.4 KB |
wm831x-ts.c | -rw-r--r-- | 11.5 KB |
wm9705.c | -rw-r--r-- | 9.2 KB |
wm9712.c | -rw-r--r-- | 11.7 KB |
wm9713.c | -rw-r--r-- | 12.2 KB |
wm97xx-core.c | -rw-r--r-- | 21.5 KB |
zylonite-wm97xx.c | -rw-r--r-- | 5.6 KB |
Computing file changes ...