diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2017-09-05 11:07:05 +0200 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2017-09-05 11:07:05 +0200 |
| commit | b11918bdbe79bd002d00a9f1d78958167ccfad99 (patch) | |
| tree | 931c5680a242041f49b07b20823012ae9bdb98c2 /arch/m32r/include/uapi | |
| parent | d3c7ad2432115b0b53fb838c14b8ad9ad72f7254 (diff) | |
| parent | 0152b29c89650654abf4f0e96bbf2566b85ae55d (diff) | |
Merge branch 'for-4.14/battery' into for-linus
- support for batteries driven by HID input reports, from Dmitry Torokhov
Diffstat (limited to 'arch/m32r/include/uapi')
| -rw-r--r-- | arch/m32r/include/uapi/asm/Kbuild | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/m32r/include/uapi/asm/Kbuild b/arch/m32r/include/uapi/asm/Kbuild index c94ee54210bc..1c44d3b3eba0 100644 --- a/arch/m32r/include/uapi/asm/Kbuild +++ b/arch/m32r/include/uapi/asm/Kbuild @@ -1,4 +1,5 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.asm -generic-y += siginfo.h +generic-y += kvm_para.h +generic-y += siginfo.h |