Hi all,
Today's linux-next merge of the counter-next tree got a conflict in:
drivers/counter/ti-eqep.c
between commit:
0cf81c73e4c6a ("counter: ti-eqep: enable clock at probe")
from the counter-current tree and commit:
1c30c6d024726 ("counter: ti-eqep: implement over/underflow events")
from the counter-next tree.
I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging. You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.
diff --cc drivers/counter/ti-eqep.c
index 825ae22c3ebc7,9742ba9fc3072..0000000000000
--- a/drivers/counter/ti-eqep.c
+++ b/drivers/counter/ti-eqep.c
@@@ -6,8 -6,8 +6,9 @@@
*/
#include <linux/bitops.h>
+#include <linux/clk.h>
#include <linux/counter.h>
+ #include <linux/interrupt.h>
#include <linux/kernel.h>
#include <linux/mod_devicetable.h>
#include <linux/module.h>
@@@ -377,8 -465,7 +466,8 @@@ static int ti_eqep_probe(struct platfor
struct counter_device *counter;
struct ti_eqep_cnt *priv;
void __iomem *base;
+ struct clk *clk;
- int err;
+ int err, irq;
counter = devm_counter_alloc(dev, sizeof(*priv));
if (!counter)
Attachment:
signature.asc
Description: PGP signature
