diff options
| author | Ingo Molnar <mingo@kernel.org> | 2019-05-13 20:30:15 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2019-05-13 20:30:15 +0200 |
| commit | 82045dd85566d87128dcc66277cf1177d9930a4a (patch) | |
| tree | 22fea6311a4866293005a1a44f34310e4007a3c9 /arch/arm/include/asm/Kbuild | |
| parent | e0478542cfd4d993e38d5f92a3f3ecd238805e96 (diff) | |
| parent | ffa6f55eb6188ee73339cab710fabf30d13110a7 (diff) | |
Merge branch 'linus' into core/urgent, to merge in dependent changes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/arm/include/asm/Kbuild')
| -rw-r--r-- | arch/arm/include/asm/Kbuild | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/include/asm/Kbuild b/arch/arm/include/asm/Kbuild index a8a4eb7f6dae..41deac2451af 100644 --- a/arch/arm/include/asm/Kbuild +++ b/arch/arm/include/asm/Kbuild @@ -9,10 +9,10 @@ generic-y += kdebug.h generic-y += local.h generic-y += local64.h generic-y += mm-arch-hooks.h +generic-y += mmiowb.h generic-y += msi.h generic-y += parport.h generic-y += preempt.h -generic-y += rwsem.h generic-y += seccomp.h generic-y += segment.h generic-y += serial.h |