diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2009-02-19 12:54:29 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2009-02-19 12:54:29 +1100 |
| commit | cced00eb9d908a07efecfd9b2a2ac4847b88056b (patch) | |
| tree | 3254bda8a5205cbc5d095b176c6279fe2f32c5ed /drivers/char | |
| parent | 2d903a87a727c63252685bca707e3c2575aa78d8 (diff) | |
| parent | b662d2f7b4fd822bcaae95bc49e05bc1e6dabe24 (diff) | |
Merge commit 'genirq/auto-genirq-next'
Conflicts:
kernel/irq/handle.c
Diffstat (limited to 'drivers/char')
| -rw-r--r-- | drivers/char/random.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/drivers/char/random.c b/drivers/char/random.c index 7c13581ca9cd..7c43ae782b26 100644 --- a/drivers/char/random.c +++ b/drivers/char/random.c @@ -241,6 +241,10 @@ #include <linux/percpu.h> #include <linux/cryptohash.h> +#ifdef CONFIG_GENERIC_HARDIRQS +# include <linux/irq.h> +#endif + #include <asm/processor.h> #include <asm/uaccess.h> #include <asm/irq.h> @@ -558,7 +562,7 @@ struct timer_rand_state { unsigned dont_count_entropy:1; }; -#ifndef CONFIG_SPARSE_IRQ +#ifndef CONFIG_GENERIC_HARDIRQS static struct timer_rand_state *irq_timer_state[NR_IRQS]; |