Skip to content

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

ARM: OMAP: Compile fix for cpu.h 

Fixed ifdefs in cpu.h and reformatted a bit.
parent 9ca6aa19
Hide whitespace changes
Inline Side-by-side
Showing with 12 additions and 14 deletions
include/asm-arm/arch-omap/cpu.h
View file @ cb363b93
...@@ -102,18 +102,17 @@ IS_OMAP_CLASS(24xx, 0x24) ...@@ -102,18 +102,17 @@ IS_OMAP_CLASS(24xx, 0x24)
#define cpu_is_omap24xx() 0 #define cpu_is_omap24xx() 0
#if defined(MULTI_OMAP1) #if defined(MULTI_OMAP1)
# if defined(CONFIG_ARCH_OMAP730) # if defined(CONFIG_ARCH_OMAP730)
# undef cpu_is_omap7xx # undef cpu_is_omap7xx
# define cpu_is_omap7xx() is_omap7xx() # define cpu_is_omap7xx() is_omap7xx()
# endif # endif
# if defined(CONFIG_ARCH_OMAP1510) # if defined(CONFIG_ARCH_OMAP1510)
# undef cpu_is_omap15xx # undef cpu_is_omap15xx
# define cpu_is_omap15xx() is_omap15xx() # define cpu_is_omap15xx() is_omap15xx()
# endif # endif
# if defined(CONFIG_ARCH_OMAP16XX) # if defined(CONFIG_ARCH_OMAP16XX)
# undef cpu_is_omap16xx # undef cpu_is_omap16xx
# define cpu_is_omap16xx() is_omap16xx() # define cpu_is_omap16xx() is_omap16xx()
# endif
# endif # endif
#else #else
# if defined(CONFIG_ARCH_OMAP730) # if defined(CONFIG_ARCH_OMAP730)
...@@ -199,10 +198,9 @@ IS_OMAP_TYPE(2420, 0x24) ...@@ -199,10 +198,9 @@ IS_OMAP_TYPE(2420, 0x24)
# define cpu_is_omap1710() is_omap1710() # define cpu_is_omap1710() is_omap1710()
#endif #endif
# if defined(CONFIG_ARCH_OMAP2420) #if defined(CONFIG_ARCH_OMAP2420)
# undef cpu_is_omap2420 # undef cpu_is_omap2420
# define cpu_is_omap2420() 1 # define cpu_is_omap2420() 1
# endif
#endif #endif
#endif #endif
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