diff options
| author | James Morris <jmorris@namei.org> | 2018-02-21 08:21:41 -0800 |
|---|---|---|
| committer | James Morris <jmorris@namei.org> | 2018-02-21 08:21:41 -0800 |
| commit | 45ce5d915020b8c76238e123748e0eb6e9ddd6ad (patch) | |
| tree | 916682ca7617ad686d2f8f9cac41ec4e9c432b00 /crypto/ablk_helper.c | |
| parent | 4a06f454768a7e11e8f10b900b450786546cbba1 (diff) | |
| parent | 17a3638239bb39acce5f03e779c69bc0e4a5c736 (diff) | |
| download | linux-crypto-45ce5d915020b8c76238e123748e0eb6e9ddd6ad.tar.gz linux-crypto-45ce5d915020b8c76238e123748e0eb6e9ddd6ad.zip | |
Merge tag 'v4.16-rc2' into next-general
Sync to Linux 4.16-rc2 for developers to work against.
Diffstat (limited to 'crypto/ablk_helper.c')
| -rw-r--r-- | crypto/ablk_helper.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/crypto/ablk_helper.c b/crypto/ablk_helper.c index 1441f07d..09776bb1 100644 --- a/crypto/ablk_helper.c +++ b/crypto/ablk_helper.c @@ -18,9 +18,7 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - * USA + * along with this program. If not, see <http://www.gnu.org/licenses/>. * */ @@ -28,7 +26,6 @@ #include <linux/crypto.h> #include <linux/init.h> #include <linux/module.h> -#include <linux/hardirq.h> #include <crypto/algapi.h> #include <crypto/cryptd.h> #include <crypto/ablk_helper.h> |