From: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Date: Wed, 17 Oct 2018 15:49:04 +0000 (+0300)
Subject: pinctrl: merrifield: include bits.h instead of bitops.h
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=f27a0d9ad366d20d4aa606306f1967b75b648c36;p=linux.git

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>
---

diff --git a/drivers/pinctrl/intel/pinctrl-merrifield.c b/drivers/pinctrl/intel/pinctrl-merrifield.c
index 2e9988dac55f1..4b65e1296b8af 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>