diff options
| author | Tony Lindgren <[email protected]> | 2014-03-02 14:22:03 -0800 |
|---|---|---|
| committer | Tony Lindgren <[email protected]> | 2014-03-02 14:22:03 -0800 |
| commit | f777ba1780584b100ab9664cc06d04f3bb273a84 (patch) | |
| tree | 865813eb0078530ca3b036c0c3eee6ce33f9315f /include/linux/compiler-gcc4.h | |
| parent | f68e355c86cff91e5266cf937ea24fcba0641900 (diff) | |
| parent | 1a5fe3ca5ea192d4309dd61f3626b79ff38693c2 (diff) | |
Merge tag 'for_3.15/dts_signed' of git://git.kernel.org/pub/scm/linux/kernel/git/bcousson/linux-omap-dt into omap-for-v3.15/dt
Add craneboard devices
Add more N900 devices
Add am43x-epos-evm and am437x-gp-evm devices
Add OMAP4 DMM devices
Conflicts:
arch/arm/boot/dts/am43x-epos-evm.dts
arch/arm/boot/dts/dra7.dtsi
Diffstat (limited to 'include/linux/compiler-gcc4.h')
| -rw-r--r-- | include/linux/compiler-gcc4.h | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/include/linux/compiler-gcc4.h b/include/linux/compiler-gcc4.h index ded429966c1f..2507fd2a1eb4 100644 --- a/include/linux/compiler-gcc4.h +++ b/include/linux/compiler-gcc4.h @@ -75,11 +75,7 @@ * * (asm goto is automatically volatile - the naming reflects this.) */ -#if GCC_VERSION <= 40801 -# define asm_volatile_goto(x...) do { asm goto(x); asm (""); } while (0) -#else -# define asm_volatile_goto(x...) do { asm goto(x); } while (0) -#endif +#define asm_volatile_goto(x...) do { asm goto(x); asm (""); } while (0) #ifdef CONFIG_ARCH_USE_BUILTIN_BSWAP #if GCC_VERSION >= 40400 |