diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2015-10-13 17:00:14 (GMT) |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2015-10-13 17:00:14 (GMT) |
| commit | e50226b4b86755e65aef2129e94d952fee3df722 (patch) | |
| tree | d4dd925fc7f5c6fe46b647c8027911190595f014 /arch/nios2 | |
| parent | e9849777d0e27cdd2902805be51da73e7c79578c (diff) | |
| parent | 25cb62b76430a91cc6195f902e61c2cb84ade622 (diff) | |
| download | linux-e50226b4b86755e65aef2129e94d952fee3df722.tar.xz | |
Merge branch 'linus' into irq/core
Bring in upstream updates for patches which depend on them
Diffstat (limited to 'arch/nios2')
| -rw-r--r-- | arch/nios2/include/asm/Kbuild | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/nios2/include/asm/Kbuild b/arch/nios2/include/asm/Kbuild index 914864e..d63330e 100644 --- a/arch/nios2/include/asm/Kbuild +++ b/arch/nios2/include/asm/Kbuild @@ -61,4 +61,5 @@ generic-y += types.h generic-y += unaligned.h generic-y += user.h generic-y += vga.h +generic-y += word-at-a-time.h generic-y += xor.h |