From: Olof Johansson <olof@lixom.net>
Date: Sun, 7 Oct 2012 14:22:32 +0000 (-0700)
Subject: Merge branch 'late/fixes' into fixes
X-Git-Tag: v3.7-rc1~38^2~5
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=0b33162ec5ce4316effd95374768b59dc6f63326;p=platform%2Fkernel%2Flinux-stable.git

Merge branch 'late/fixes' into fixes

This is a series from Arnd that fixes a number of compiler warnings
when building defconfigs on ARM.

* late/fixes:
  ARM: footbridge: nw_gpio_lock is raw_spin_lock
  ARM: mv78xx0: correct addr_map_cfg __initdata annotation
  ARM: footbridge: remove RTC_IRQ definition
  ARM: soc: dependency warnings for errata
  ARM: ks8695: __arch_virt_to_dma type handling
  ARM: rpc: check device_register return code in ecard_probe
  ARM: davinci: don't mark da850_register_cpufreq as __init
  ARM: iop13xx: fix iq81340sc_atux_map_irq prototype
  ARM: iop13xx: mark iop13xx_scan_bus as __devinit
  ARM: mv78xx0: mark mv78xx0_timer_init as __init_refok
  ARM: s3c24xx: fix multiple section mismatch warnings
  ARM: at91: unused variable in at91_pm_verify_clocks
  ARM: at91: skip at91_io_desc definition for NOMMU
  ARM: pxa: work around duplicate definition of GPIO24_SSP1_SFRM
  ARM: pxa: remove sharpsl_fatal_check function
  ARM: pxa: define palmte2_pxa_keys conditionally
  ARM: pxa: Wunused-result warning in viper board file
  ARM: shark: fix shark_pci_init return code

Fixed trivial conflicts in arch/arm/mach-at91/setup.c.

Signed-off-by: Olof Johansson <olof@lixom.net>
---

0b33162ec5ce4316effd95374768b59dc6f63326
diff --cc arch/arm/mach-at91/setup.c
index e6f52de,3a53f3d..da9881b
--- a/arch/arm/mach-at91/setup.c
+++ b/arch/arm/mach-at91/setup.c
@@@ -87,8 -87,8 +87,8 @@@ void __init at91_init_sram(int bank, un
  	iotable_init(desc, 1);
  }
  
- static struct map_desc at91_io_desc __initdata = {
+ static struct map_desc at91_io_desc __initdata __maybe_unused = {
 -	.virtual	= AT91_VA_BASE_SYS,
 +	.virtual	= (unsigned long)AT91_VA_BASE_SYS,
  	.pfn		= __phys_to_pfn(AT91_BASE_SYS),
  	.length		= SZ_16K,
  	.type		= MT_DEVICE,
diff --cc arch/arm/mach-pxa/cm-x2xx.c
index fc3afc7,ae5e74a..a103c8f
--- a/arch/arm/mach-pxa/cm-x2xx.c
+++ b/arch/arm/mach-pxa/cm-x2xx.c
@@@ -22,9 -22,10 +22,10 @@@
  #include <asm/mach/map.h>
  
  #include <mach/pxa25x.h>
+ #undef GPIO24_SSP1_SFRM
  #include <mach/pxa27x.h>
  #include <mach/audio.h>
 -#include <mach/pxafb.h>
 +#include <linux/platform_data/video-pxafb.h>
  #include <mach/smemc.h>
  
  #include <asm/hardware/it8152.h>