diff options
| author | Greg Kroah-Hartman | 2019-01-28 08:13:52 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman | 2019-01-28 08:13:52 +0100 |
| commit | fdddcfd9c93c6db006004fa5ba7fd9380e721c3f (patch) | |
| tree | 4d029f3bd29be07eac87bcfad3bd7e3012fb9428 /include/linux/compiler-intel.h | |
| parent | mbcs: add .owner to mbcs struct file_operations (diff) | |
| parent | Linux 5.0-rc4 (diff) | |
| download | kernel-qcow2-linux-fdddcfd9c93c6db006004fa5ba7fd9380e721c3f.tar.gz kernel-qcow2-linux-fdddcfd9c93c6db006004fa5ba7fd9380e721c3f.tar.xz kernel-qcow2-linux-fdddcfd9c93c6db006004fa5ba7fd9380e721c3f.zip | |
Merge 5.0-rc4 into char-misc-next
We need the char-misc fixes in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'include/linux/compiler-intel.h')
| -rw-r--r-- | include/linux/compiler-intel.h | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/include/linux/compiler-intel.h b/include/linux/compiler-intel.h index 517bd14e1222..b17f3cd18334 100644 --- a/include/linux/compiler-intel.h +++ b/include/linux/compiler-intel.h @@ -5,9 +5,7 @@ #ifdef __ECC -/* Some compiler specific definitions are overwritten here - * for Intel ECC compiler - */ +/* Compiler specific definitions for Intel ECC compiler */ #include <asm/intrinsics.h> |