diff options
| author | Joerg Roedel <jroedel@suse.de> | 2019-06-24 04:23:16 -0400 |
|---|---|---|
| committer | Joerg Roedel <jroedel@suse.de> | 2019-06-24 04:23:16 -0400 |
| commit | ceedd5f74d8cfe34db4e654a7808e3c5de40d6f5 (patch) | |
| tree | e19c18292231202e9cd8d484ee43f46b2c9c9ad1 /include/linux/netdev_features.h | |
| parent | 1b961423158caaae49d3900b7c9c37477bbfa9b3 (diff) | |
| parent | 4b972a01a7da614b4796475f933094751a295a2f (diff) | |
Merge tag 'v5.2-rc6' into generic-dma-ops
Linux 5.2-rc6
Diffstat (limited to 'include/linux/netdev_features.h')
| -rw-r--r-- | include/linux/netdev_features.h | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/include/linux/netdev_features.h b/include/linux/netdev_features.h index 4c76fe2c8488..4b19c544c59a 100644 --- a/include/linux/netdev_features.h +++ b/include/linux/netdev_features.h | |||
| @@ -1,11 +1,6 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0-or-later */ | ||
| 1 | /* | 2 | /* |
| 2 | * Network device features. | 3 | * Network device features. |
| 3 | * | ||
| 4 | * | ||
| 5 | * This program is free software; you can redistribute it and/or | ||
| 6 | * modify it under the terms of the GNU General Public License | ||
| 7 | * as published by the Free Software Foundation; either version | ||
| 8 | * 2 of the License, or (at your option) any later version. | ||
| 9 | */ | 4 | */ |
| 10 | #ifndef _LINUX_NETDEV_FEATURES_H | 5 | #ifndef _LINUX_NETDEV_FEATURES_H |
| 11 | #define _LINUX_NETDEV_FEATURES_H | 6 | #define _LINUX_NETDEV_FEATURES_H |