summaryrefslogtreecommitdiff
path: root/net/switchdev
diff options
context:
space:
mode:
authorAndy Shevchenko <andriy.shevchenko@linux.intel.com>2017-01-03 11:51:48 -0800
committerDmitry Torokhov <dmitry.torokhov@gmail.com>2017-01-03 12:33:12 -0800
commit01427fe7c4b956b878e55e966690624a3624e991 (patch)
tree20b45bd749304ccd21b4348ceafe57e115fe0923 /net/switchdev
parent47e3a5edc6538d66e470aaed3b7c57255cb37ca1 (diff)
Input: adxl34x - make it enumerable in ACPI environment
The ACPI-enabled platform may contain _DSD method to enable this driver using compatible string. Remove OF specifics to re-use existing code on ACPI-enabled platforms. Suggested-by: Mika Westerberg <mika.westerberg@linux.intel.com> Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com> Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Diffstat (limited to 'net/switchdev')
0 files changed, 0 insertions, 0 deletions
ivate-remove&id=045169816b31b10faed984b01c390db1b32ee4c1&id2=678b5c6b22fed89a13d5b2267f423069a9b11c80'>diff)
Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
Pull crypto fixes from Herbert Xu: "This fixes the following issues: - Fix pointer size when caam is used with AArch64 boot loader on AArch32 kernel. - Fix ahash state corruption in marvell driver. - Fix buggy algif_aed tag handling. - Prevent mcryptd from being used with incompatible algorithms which can cause crashes" * 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6: crypto: algif_aead - fix uninitialized variable warning crypto: mcryptd - Check mcryptd algorithm compatibility crypto: algif_aead - fix AEAD tag memory handling crypto: caam - fix pointer size for AArch64 boot loader, AArch32 kernel crypto: marvell - Don't corrupt state of an STD req for re-stepped ahash crypto: marvell - Don't copy hash operation twice into the SRAM
Diffstat (limited to 'include/sound/emu8000.h')