linux-next: manual merge of the random tree with the mfd tree

[Stephen Rothwell]

Hi Theodore,

Today's linux-next merge of the random tree got a conflict in
drivers/mfd/ab3100-core.c between commit 7f0f07ce25b6 ("mfd: Use devm
allocation for ab3100-core") from the mfd tree and commit 627574db8b21
("random: remove rand_initialize_irq()") from the random tree.

I fixed it up (see below) and can carry the fix as necessary.
-- 
Cheers,
Stephen Rothwell                    sfr@xxxxxxxxxxxxxxxx

diff --cc drivers/mfd/ab3100-core.c
index 4276aab,1287645..0000000
--- a/drivers/mfd/ab3100-core.c
+++ b/drivers/mfd/ab3100-core.c
@@@ -931,13 -929,10 +929,11 @@@ static int __devinit ab3100_probe(struc
  	if (err)
  		goto exit_no_setup;
  
 -	err = request_threaded_irq(client->irq, NULL, ab3100_irq_handler,
 -				IRQF_ONESHOT, "ab3100-core", ab3100);
 +	err = devm_request_threaded_irq(&client->dev,
 +					client->irq, NULL, ab3100_irq_handler,
 +					IRQF_ONESHOT, "ab3100-core", ab3100);
  	if (err)
  		goto exit_no_irq;
- 	/* This real unpredictable IRQ is of course sampled for entropy */
- 	rand_initialize_irq(client->irq);
  
  	err = abx500_register_ops(&client->dev, &ab3100_ops);
  	if (err)

Attachment: pgp00000.pgp
Description: PGP signature