summaryrefslogtreecommitdiffstats
path: root/include/linux/bitops.h
diff options
context:
space:
mode:
authorTom Rini <trini@konsulko.com>2017-04-04 09:17:56 -0400
committerTom Rini <trini@konsulko.com>2017-04-04 09:17:56 -0400
commitf532703665ae5e5957211bbc4e7296a8313cc403 (patch)
tree83553bf3d230f555feadaa1d3958742f232bd4cc /include/linux/bitops.h
parent797f165f7ae90a75579ae3df7932d8d1518e8544 (diff)
parent941f7a4b2606ef468f4f3b763261b758eadee861 (diff)
downloadu-boot-f532703665ae5e5957211bbc4e7296a8313cc403.tar.gz
u-boot-f532703665ae5e5957211bbc4e7296a8313cc403.tar.xz
u-boot-f532703665ae5e5957211bbc4e7296a8313cc403.zip
Merge git://www.denx.de/git/u-boot-marvell
This includes Marvell mvpp2 patches with the ethernet support for the ARMv8 Armada 7k/8k platforms. The ethernet patches are all acked by Joe and he is okay with me pushing them via the Marvell tree.
Diffstat (limited to 'include/linux/bitops.h')
-rw-r--r--include/linux/bitops.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/bitops.h b/include/linux/bitops.h
index 1b2e4915a0..576b15dc53 100644
--- a/include/linux/bitops.h
+++ b/include/linux/bitops.h
@@ -2,6 +2,7 @@
#define _LINUX_BITOPS_H
#include <asm/types.h>
+#include <asm-generic/bitsperlong.h>
#include <linux/compiler.h>
#define BIT(nr) (1UL << (nr))