Conflict in merge of the the random tree

[Mark Brown]

While merging the random tree into -next there was a trivial conflict
in drivers/char/random.c between 0244ad004a54e3 (Remove GENERIC_HARDIRQ
config option) and 557360455b (random: push extra entropy to the output
pools).

I've fixed this up as below:

diff --cc drivers/char/random.c
index 7737b5b,f126bd2..0000000
--- a/drivers/char/random.c
+++ b/drivers/char/random.c
@@@ -255,8 -255,12 +255,9 @@@
  #include <linux/fips.h>
  #include <linux/ptrace.h>
  #include <linux/kmemcheck.h>
 +#include <linux/irq.h>
+ #include <linux/workqueue.h>
  
 -#ifdef CONFIG_GENERIC_HARDIRQS
 -# include <linux/irq.h>
 -#endif
 -
  #include <asm/processor.h>
  #include <asm/uaccess.h>
  #include <asm/irq.h>

Attachment: signature.asc
Description: Digital signature