Merge branch '2020-06-15-misc-bugfixes'

[oweals/u-boot.git] / drivers / timer / omap-timer.c

diff --git a/drivers/timer/omap-timer.c b/drivers/timer/omap-timer.c
index f10df69092a4500f1951705df5960e9dbfd65f2b..700c349f371631e6a38c47b6f3f3a97cee631a16 100644 (file)
--- a/drivers/timer/omap-timer.c
+++ b/drivers/timer/omap-timer.c
@@ -11,6 +11,7 @@
 #include <timer.h>
 #include <asm/io.h>
 #include <asm/arch/clock.h>
+#include <linux/bitops.h>
 
 /* Timer register bits */
 #define TCLR_START                     BIT(0)  /* Start=1 */
@@ -104,5 +105,4 @@ U_BOOT_DRIVER(omap_timer) = {
        .priv_auto_alloc_size = sizeof(struct omap_timer_priv),
        .probe = omap_timer_probe,
        .ops    = &omap_timer_ops,
-       .flags = DM_FLAG_PRE_RELOC,
 };