Skip to content

L
linux-davinci
Commit 8a68d361 authored by Tony Lindgren's avatar Tony Lindgren
Browse files
Options

Sync with mainline 

Signed-off-by: default avatarTony Lindgren <tony@atomide.com>
parent 4e00bfe6
Hide whitespace changes
Inline Side-by-side
Showing with 5 additions and 5 deletions
arch/arm/mach-omap2/Kconfig
View file @ 8a68d361
...@@ -32,6 +32,10 @@ config MACH_OMAP_H4 ...@@ -32,6 +32,10 @@ config MACH_OMAP_H4
select OMAP_DEBUG_DEVICES select OMAP_DEBUG_DEVICES
select GPIOEXPANDER_OMAP select GPIOEXPANDER_OMAP
config MACH_OMAP_2430SDP
bool "OMAP 2430 SDP board"
depends on ARCH_OMAP2 && ARCH_OMAP24XX
config MACH_OMAP_H4_TUSB config MACH_OMAP_H4_TUSB
bool "TUSB 6010 EVM board" bool "TUSB 6010 EVM board"
depends on MACH_OMAP_H4 depends on MACH_OMAP_H4
...@@ -69,8 +73,3 @@ config MACH_OMAP2_H4_USB1 ...@@ -69,8 +73,3 @@ config MACH_OMAP2_H4_USB1
config MACH_OMAP_APOLLON config MACH_OMAP_APOLLON
bool "OMAP 2420 Apollon board" bool "OMAP 2420 Apollon board"
depends on ARCH_OMAP2 && ARCH_OMAP24XX depends on ARCH_OMAP2 && ARCH_OMAP24XX
config MACH_OMAP_2430SDP
bool "OMAP 2430 SDP board"
depends on ARCH_OMAP2 && ARCH_OMAP24XX
arch/arm/mach-omap2/gpmc.c
View file @ 8a68d361
...@@ -271,6 +271,7 @@ int gpmc_cs_set_reserved(int cs, int reserved) ...@@ -271,6 +271,7 @@ int gpmc_cs_set_reserved(int cs, int reserved)
gpmc_cs_map &= ~(1 << cs); gpmc_cs_map &= ~(1 << cs);
gpmc_cs_map |= (reserved ? 1 : 0) << cs; gpmc_cs_map |= (reserved ? 1 : 0) << cs;
return 0; return 0;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment