diff options
| author | David Woodhouse <dwmw2@infradead.org> | 2007-01-17 18:34:51 -0500 |
|---|---|---|
| committer | David Woodhouse <dwmw2@infradead.org> | 2007-01-17 18:34:51 -0500 |
| commit | 9cdf083f981b8d37b3212400a359368661385099 (patch) | |
| tree | aa15a6a08ad87e650dea40fb59b3180bef0d345b /arch/ia64/sn/kernel/msi_sn.c | |
| parent | e499e01d234a31d59679b7b1e1cf628d917ba49a (diff) | |
| parent | a8b3485287731978899ced11f24628c927890e78 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'arch/ia64/sn/kernel/msi_sn.c')
| -rw-r--r-- | arch/ia64/sn/kernel/msi_sn.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/arch/ia64/sn/kernel/msi_sn.c b/arch/ia64/sn/kernel/msi_sn.c index 6ffd1f850d41..b3a435fd70fb 100644 --- a/arch/ia64/sn/kernel/msi_sn.c +++ b/arch/ia64/sn/kernel/msi_sn.c | |||
| @@ -136,10 +136,6 @@ int sn_setup_msi_irq(unsigned int irq, struct pci_dev *pdev) | |||
| 136 | */ | 136 | */ |
| 137 | msg.data = 0x100 + irq; | 137 | msg.data = 0x100 + irq; |
| 138 | 138 | ||
| 139 | #ifdef CONFIG_SMP | ||
| 140 | set_irq_affinity_info(irq, sn_irq_info->irq_cpuid, 0); | ||
| 141 | #endif | ||
| 142 | |||
| 143 | write_msi_msg(irq, &msg); | 139 | write_msi_msg(irq, &msg); |
| 144 | set_irq_chip_and_handler(irq, &sn_msi_chip, handle_edge_irq); | 140 | set_irq_chip_and_handler(irq, &sn_msi_chip, handle_edge_irq); |
| 145 | 141 | ||