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/internal.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/internal.h')
| -rw-r--r-- | crypto/internal.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/crypto/internal.h b/crypto/internal.h index bd39bfc9..00e42a3e 100644 --- a/crypto/internal.h +++ b/crypto/internal.h @@ -25,7 +25,6 @@ #include <linux/notifier.h> #include <linux/rwsem.h> #include <linux/slab.h> -#include <linux/fips.h> /* Crypto notification events. */ enum { @@ -103,6 +102,8 @@ int crypto_register_notifier(struct notifier_block *nb); int crypto_unregister_notifier(struct notifier_block *nb); int crypto_probing_notify(unsigned long val, void *v); +unsigned int crypto_alg_extsize(struct crypto_alg *alg); + static inline struct crypto_alg *crypto_alg_get(struct crypto_alg *alg) { atomic_inc(&alg->cra_refcnt); |