diff options
| author | Daniel Vetter <daniel.vetter@ffwll.ch> | 2015-07-15 16:36:50 +0200 |
|---|---|---|
| committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2015-07-15 16:36:50 +0200 |
| commit | aae2c59be8b1c95876946285d83c8163412367d4 (patch) | |
| tree | 8fb05d773ddcfd7739de5c7291bc5fad9a42b2bd /crypto/tcrypt.h | |
| parent | 8becc9953f7f8b7980106ced51ec8ed67ccc09f9 (diff) | |
| parent | 2d361b75fadcca0a45fc1dccc96c3c74ce80dd6c (diff) | |
| download | linux-crypto-aae2c59be8b1c95876946285d83c8163412367d4.tar.gz linux-crypto-aae2c59be8b1c95876946285d83c8163412367d4.zip | |
Merge tag 'drm-intel-fixes-2015-07-15' into drm-intel-next-queued
Backmerge fixes since it's getting out of hand again with the massive
split due to atomic between -next and 4.2-rc. All the bugfixes in
4.2-rc are addressed already (by converting more towards atomic
instead of minimal duct-tape) so just always pick the version in next
for the conflicts in modeset code.
All the other conflicts are just adjacent lines changed.
Conflicts:
drivers/gpu/drm/i915/i915_drv.h
drivers/gpu/drm/i915/i915_gem_gtt.c
drivers/gpu/drm/i915/intel_display.c
drivers/gpu/drm/i915/intel_drv.h
drivers/gpu/drm/i915/intel_ringbuffer.h
Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
Diffstat (limited to 'crypto/tcrypt.h')
| -rw-r--r-- | crypto/tcrypt.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/crypto/tcrypt.h b/crypto/tcrypt.h index 6c7e21a0..6cc1b856 100644 --- a/crypto/tcrypt.h +++ b/crypto/tcrypt.h @@ -65,6 +65,7 @@ static u8 speed_template_32_64[] = {32, 64, 0}; /* * AEAD speed tests */ +static u8 aead_speed_template_19[] = {19, 0}; static u8 aead_speed_template_20[] = {20, 0}; /* |