Merge tag 'sound-3.12' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound

[mirror_ubuntu-bionic-kernel.git] / drivers / char / random.c

diff --git a/drivers/char/random.c b/drivers/char/random.c
index 0d91fe52f3f5eee10397563361a4b1dd1579e8cf..7737b5bd26af816e4361a906ad9d0cd6966b7287 100644 (file)
--- a/drivers/char/random.c
+++ b/drivers/char/random.c
@@ -255,10 +255,7 @@
 #include <linux/fips.h>
 #include <linux/ptrace.h>
 #include <linux/kmemcheck.h>
-
-#ifdef CONFIG_GENERIC_HARDIRQS
-# include <linux/irq.h>
-#endif
+#include <linux/irq.h>
 
 #include <asm/processor.h>
 #include <asm/uaccess.h>