Sync with mainline

Signed-off-by: Tony Lindgren <tony@atomide.com>

diff --git a/arch/arm/mach-omap2/Kconfig b/arch/arm/mach-omap2/Kconfig
index bb49f0ec69c11daa77b07d5ed7b8fd3baec99bae..83608e43c9e675cce04c84d98d99d71b9d34aed7 100644 (file)
--- a/arch/arm/mach-omap2/Kconfig
+++ b/arch/arm/mach-omap2/Kconfig
@@ -32,6 +32,10 @@ config MACH_OMAP_H4
        select OMAP_DEBUG_DEVICES
        select GPIOEXPANDER_OMAP
 
+config MACH_OMAP_2430SDP
+       bool "OMAP 2430 SDP board"
+       depends on ARCH_OMAP2 && ARCH_OMAP24XX
+
 config MACH_OMAP_H4_TUSB
        bool "TUSB 6010 EVM board"
        depends on MACH_OMAP_H4
@@ -69,8 +73,3 @@ config MACH_OMAP2_H4_USB1
 config MACH_OMAP_APOLLON
        bool "OMAP 2420 Apollon board"
        depends on ARCH_OMAP2 && ARCH_OMAP24XX
-
-config MACH_OMAP_2430SDP
-       bool "OMAP 2430 SDP board"
-       depends on ARCH_OMAP2 && ARCH_OMAP24XX
-

diff --git a/arch/arm/mach-omap2/gpmc.c b/arch/arm/mach-omap2/gpmc.c
index 629af02ae04a95016ff859a53866812182500ecf..a3f31f0212a3aef563a59d1ed664df88adfa180f 100644 (file)
--- a/arch/arm/mach-omap2/gpmc.c
+++ b/arch/arm/mach-omap2/gpmc.c
@@ -271,6 +271,7 @@ int gpmc_cs_set_reserved(int cs, int reserved)
 
        gpmc_cs_map &= ~(1 << cs);
        gpmc_cs_map |= (reserved ? 1 : 0) << cs;
+
        return 0;
 }