diff options
| author | David S. Miller <davem@davemloft.net> | 2019-01-21 17:41:32 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2019-01-21 17:41:32 -0500 |
| commit | fa7f3a8d56b38a3ed1880a3780afba82387da277 (patch) | |
| tree | a4628ee966f21963e5e97a6d1a227a3e8138183e /include/linux/compiler-intel.h | |
| parent | 28f9d1a3d4fecdb2352d3984ddeec88146385885 (diff) | |
| parent | 49a57857aeea06ca831043acbb0fa5e0f50602fd (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Completely minor snmp doc conflict.
Signed-off-by: David S. Miller <davem@davemloft.net>
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 @@ | |||
| 5 | 5 | ||
| 6 | #ifdef __ECC | 6 | #ifdef __ECC |
| 7 | 7 | ||
| 8 | /* Some compiler specific definitions are overwritten here | 8 | /* Compiler specific definitions for Intel ECC compiler */ |
| 9 | * for Intel ECC compiler | ||
| 10 | */ | ||
| 11 | 9 | ||
| 12 | #include <asm/intrinsics.h> | 10 | #include <asm/intrinsics.h> |
| 13 | 11 | ||