diff options
| author | David S. Miller <davem@davemloft.net> | 2013-12-17 21:26:19 -0500 |
|---|---|---|
| committer | Ishan Mittal <imittal@nvidia.com> | 2014-04-30 15:06:24 +0530 |
| commit | 0fd0dfda269d160aed0a2c145d36a4a0d3d5966f (patch) | |
| tree | 1334f43146c48ba7b5b7a731668dcbcd81d1f53d /arch/powerpc | |
| parent | 324fad69a7ccf9c1aad0f4c5760e6aac7d1aed9c (diff) | |
lib: Add missing arch generic-y entries for asm-generic/hash.h
Conflicts:
arch/avr32/include/asm/Kbuild
arch/c6x/include/asm/Kbuild
arch/cris/include/asm/Kbuild
arch/ia64/include/asm/Kbuild
arch/mips/include/asm/Kbuild
arch/openrisc/include/asm/Kbuild
arch/powerpc/include/asm/Kbuild
arch/score/include/asm/Kbuild
Change-Id: I6800e3f03dbc40e94de1495459dec4b29df4474e
Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: David S. Miller <davem@davemloft.net>
(cherry picked from commit e3fec2f74f7f90d2149a24243a4d040caabe6f30)
Signed-off-by: Ishan Mittal <imittal@nvidia.com>
Diffstat (limited to 'arch/powerpc')
| -rw-r--r-- | arch/powerpc/include/asm/Kbuild | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/arch/powerpc/include/asm/Kbuild b/arch/powerpc/include/asm/Kbuild index e9416745329c..6c0a955a1b06 100644 --- a/arch/powerpc/include/asm/Kbuild +++ b/arch/powerpc/include/asm/Kbuild @@ -2,8 +2,6 @@ generic-y += clkdev.h generic-y += rwsem.h generic-y += trace_clock.h -<<<<<<< HEAD -======= generic-y += preempt.h generic-y += vtime.h ->>>>>>> a787870... sched, arch: Create asm/preempt.h +generic-y += hash.h |