diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-01-26 20:06:16 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-01-26 20:06:16 +0100 |
| commit | 77d143de75812596a58d126606f42d1214e09dde (patch) | |
| tree | 2f462fdf839e914fda343dfd3682b914b0a796f4 /arch/um/include/asm/Kbuild | |
| parent | Merge tag 'mmc-updates-for-3.14-rc1' of git://git.kernel.org/pub/scm/linux/ke... (diff) | |
| parent | um: hostfs: make functions static (diff) | |
| download | linux-77d143de75812596a58d126606f42d1214e09dde.tar.xz linux-77d143de75812596a58d126606f42d1214e09dde.zip | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/uml
Pull UML changes from Richard Weinberger:
"This time only various cleanups and housekeeping patches"
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/uml:
um: hostfs: make functions static
um: Include generic barrier.h
um: Removed unused attributes from thread_struct
Diffstat (limited to 'arch/um/include/asm/Kbuild')
| -rw-r--r-- | arch/um/include/asm/Kbuild | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/um/include/asm/Kbuild b/arch/um/include/asm/Kbuild index 75de4abe4f94..88a330dcdede 100644 --- a/arch/um/include/asm/Kbuild +++ b/arch/um/include/asm/Kbuild @@ -5,3 +5,4 @@ generic-y += switch_to.h clkdev.h generic-y += trace_clock.h generic-y += preempt.h generic-y += hash.h +generic-y += barrier.h |