summaryrefslogtreecommitdiffstats
path: root/drivers/pinctrl
diff options
context:
space:
mode:
authorAndy Shevchenko <andriy.shevchenko@linux.intel.com>2018-10-17 17:49:04 +0200
committerAndy Shevchenko <andriy.shevchenko@linux.intel.com>2018-11-08 16:16:40 +0100
commitf27a0d9ad366d20d4aa606306f1967b75b648c36 (patch)
tree7da2828a6eab85c6a8adfe431230244de16aa6b8 /drivers/pinctrl
parentpinctrl: intel: Unexport intel_pinctrl_probe() (diff)
downloadlinux-f27a0d9ad366d20d4aa606306f1967b75b648c36.tar.xz
linux-f27a0d9ad366d20d4aa606306f1967b75b648c36.zip
pinctrl: merrifield: include bits.h instead of bitops.h
The reason of including <linux/bitops.h> here is just for BIT() and Co macros. Since commit 8bd9cb51daac8 ("... Move some macros from <linux/bitops.h> to a new <linux/bits.h> file"), <linux/bits.h> is enough for such compile-time macros. Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com> Acked-by: Mika Westerberg <mika.westerberg@linux.intel.com>
Diffstat (limited to 'drivers/pinctrl')
-rw-r--r--drivers/pinctrl/intel/pinctrl-merrifield.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/pinctrl/intel/pinctrl-merrifield.c b/drivers/pinctrl/intel/pinctrl-merrifield.c
index 2e9988dac55f..4b65e1296b8a 100644
--- a/drivers/pinctrl/intel/pinctrl-merrifield.c
+++ b/drivers/pinctrl/intel/pinctrl-merrifield.c
@@ -6,7 +6,7 @@
* Author: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
*/
-#include <linux/bitops.h>
+#include <linux/bits.h>
#include <linux/err.h>
#include <linux/io.h>
#include <linux/module.h>