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

Commit 637e49ae authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'trivial' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild 

Pull treewide kbuild cleanup from Michal Marek:
 "Paul Bolle did a cleanup of <asm/*.h> headers in various
  architectures.  Because the patch touch several architectures at
  once, it was easiest for me to apply them to the kbuild tree."

* 'trivial' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild:
  Remove useless wrappers of asm-generic/rmap.h
  Remove useless wrappers of asm-generic/ipc.h
  Remove useless wrappers of asm-generic/cpumask.h
parents f6774cbc 459dac82

arch/frv/include/asm/cpumask.h

deleted100644 → 0
+0 −6
Original line number Diff line number Diff line 
#ifndef _ASM_CPUMASK_H

#define _ASM_CPUMASK_H



#include <asm-generic/cpumask.h>



#endif /* _ASM_CPUMASK_H */

arch/hexagon/include/asm/Kbuild

+0 −2
Original line number Diff line number Diff line
@@ -7,7 +7,6 @@ header-y += user.h 
generic-y += auxvec.h

generic-y += bug.h

generic-y += bugs.h

generic-y += cpumask.h

generic-y += cputime.h

generic-y += current.h

generic-y += device.h
@@ -23,7 +22,6 @@ generic-y += ioctl.h 
generic-y += ioctls.h

generic-y += iomap.h

generic-y += ipcbuf.h

generic-y += ipc.h

generic-y += irq_regs.h

generic-y += kdebug.h

generic-y += kmap_types.h

arch/mn10300/include/asm/ipc.h

deleted100644 → 0
+0 −1
Original line number Diff line number Diff line 
#include <asm-generic/ipc.h>

arch/openrisc/include/asm/Kbuild

+0 −2
Original line number Diff line number Diff line
@@ -13,7 +13,6 @@ generic-y += cacheflush.h 
generic-y += checksum.h

generic-y += cmpxchg.h

generic-y += cmpxchg-local.h

generic-y += cpumask.h

generic-y += cputime.h

generic-y += current.h

generic-y += device.h
@@ -43,7 +42,6 @@ generic-y += percpu.h 
generic-y += poll.h

generic-y += posix_types.h

generic-y += resource.h

generic-y += rmap.h

generic-y += scatterlist.h

generic-y += sections.h

generic-y += segment.h

arch/tile/include/asm/Kbuild

+0 −1
Original line number Diff line number Diff line
@@ -16,7 +16,6 @@ generic-y += fb.h 
generic-y += fcntl.h

generic-y += ioctl.h

generic-y += ioctls.h

generic-y += ipc.h

generic-y += ipcbuf.h

generic-y += irq_regs.h

generic-y += kdebug.h