Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 95bc156c authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'stable' of git://github.com/cmetcalf-tilera/linux-tile 

* 'stable' of git://github.com/cmetcalf-tilera/linux-tile:
  tile: revert change from <asm/atomic.h> to <linux/atomic.h> in asm files
parents 2ad53110 d52104b2

arch/tile/kernel/intvec_32.S

+1 −1
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ 
#include <asm/ptrace.h>

#include <asm/thread_info.h>

#include <asm/irqflags.h>

#include <linux/atomic.h>

#include <asm/atomic_32.h>

#include <asm/asm-offsets.h>

#include <hv/hypervisor.h>

#include <arch/abi.h>

arch/tile/lib/atomic_asm_32.S

+1 −1
Original line number Diff line number Diff line
@@ -70,7 +70,7 @@ 
 */



#include <linux/linkage.h>

#include <linux/atomic.h>

#include <asm/atomic_32.h>

#include <asm/page.h>

#include <asm/processor.h>