diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-06-24 13:59:00 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-06-24 13:59:00 -0700 |
| commit | b4b664bef407bc80f325b2f2ab9350823c2869de (patch) | |
| tree | 68ee04a0c995dbf7aa3ad889362dc63c7c986745 /arch/arm/common/scoop.c | |
| parent | 8b8f5d9715845f9ae2b89ce406e71877965b29ca (diff) | |
| parent | b8d8772e53f83cc87aeeab1c3a60d5d5d45ce38b (diff) | |
| download | linux-b4b664bef407bc80f325b2f2ab9350823c2869de.tar.bz2 | |
Merge branch 'fixes' of git://ftp.arm.linux.org.uk/~rmk/linux-arm
Pull ARM fixes from Russell King:
"A number of low impact fixes, the most noticable one is the thumb2
frame pointer fix. We also fix a regression caused during this merge
window with ARM925 CPUs running with caches disabled, and fix a number
of warnings"
* 'fixes' of git://ftp.arm.linux.org.uk/~rmk/linux-arm:
ARM: arm925: ensure assembly sets up writethrough mapping
ARM: perf: fix compiler warning with gcc 4.6.4 (and tidy code)
ARM: l2c: fix dependencies on PL310 errata symbols
ARM: 8069/1: Make thread_save_fp macro aware of THUMB2 mode
ARM: 8068/1: scoop: Remove unused variable
Diffstat (limited to 'arch/arm/common/scoop.c')
| -rw-r--r-- | arch/arm/common/scoop.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/arm/common/scoop.c b/arch/arm/common/scoop.c index 6ef146edd0cd..a20fa80776d3 100644 --- a/arch/arm/common/scoop.c +++ b/arch/arm/common/scoop.c @@ -182,7 +182,6 @@ static int scoop_probe(struct platform_device *pdev) struct scoop_config *inf; struct resource *mem = platform_get_resource(pdev, IORESOURCE_MEM, 0); int ret; - int temp; if (!mem) return -EINVAL; |