diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2009-03-25 11:46:38 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2009-03-25 11:46:38 +1100 |
| commit | 6a098d9dc49dd8d4d8792e5ea74a0ec14abefe31 (patch) | |
| tree | cc832a94d1ccb19e7f4bdbbfe5f740cdab28a512 /drivers | |
| parent | c7965269a3d967becff265c47028195bd00e98e5 (diff) | |
| parent | b6c02a408e57289faffd381d79996d148ae9b894 (diff) | |
Merge commit 'genirq/auto-genirq-next'
Conflicts:
kernel/irq/handle.c
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/char/random.c | 6 | ||||
| -rw-r--r-- | drivers/pci/intr_remapping.c | 2 |
2 files changed, 6 insertions, 2 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]; diff --git a/drivers/pci/intr_remapping.c b/drivers/pci/intr_remapping.c index bc5b6976f918..b041a409f4a7 100644 --- a/drivers/pci/intr_remapping.c +++ b/drivers/pci/intr_remapping.c @@ -21,7 +21,7 @@ struct irq_2_iommu { u8 irte_mask; }; -#ifdef CONFIG_SPARSE_IRQ +#ifdef CONFIG_GENERIC_HARDIRQS static struct irq_2_iommu *get_one_free_irq_2_iommu(int cpu) { struct irq_2_iommu *iommu; |