diff options
| author | Takashi Iwai <tiwai@suse.de> | 2015-03-16 14:48:05 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2015-03-16 14:48:05 +0100 |
| commit | 34e72afe73c40d9974c1f230c3b62fc43f5c5b28 (patch) | |
| tree | fee2be2e3453e246ee55ffb711a36a8ec053361a /arch/nios2/include/uapi/asm/Kbuild | |
| parent | ALSA: control: Fix breakage of user ctl element addition (diff) | |
| parent | ALSA: hda - Treat stereo-to-mono mix properly (diff) | |
| download | linux-34e72afe73c40d9974c1f230c3b62fc43f5c5b28.tar.xz linux-34e72afe73c40d9974c1f230c3b62fc43f5c5b28.zip | |
Merge branch 'for-linus' into for-next
Diffstat (limited to 'arch/nios2/include/uapi/asm/Kbuild')
| -rw-r--r-- | arch/nios2/include/uapi/asm/Kbuild | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/nios2/include/uapi/asm/Kbuild b/arch/nios2/include/uapi/asm/Kbuild index 4f07ca3f8d10..376131194cc3 100644 --- a/arch/nios2/include/uapi/asm/Kbuild +++ b/arch/nios2/include/uapi/asm/Kbuild @@ -2,3 +2,5 @@ include include/uapi/asm-generic/Kbuild.asm header-y += elf.h header-y += ucontext.h + +generic-y += ucontext.h |