diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-03-29 20:25:03 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-03-29 20:25:03 -0700 |
| commit | 9754c5f6cbbd8893a29f139204e87a59eb342ca9 (patch) | |
| tree | 43601ee92855a8b7272c30073f6037b94523ad06 /arch/ia64/pci/pci.c | |
| parent | efab03d998da03f67836ffc664b04e0400f85448 (diff) | |
| parent | dbfc2f6f95c7e62b9a379d9a34f8427f1d844ee1 (diff) | |
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6
* 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6:
[IA64] Fix arch/ia64/pci/pci.c:571: warning: `return' with a value
[IA64] Speed up boot - skip unnecessary clock calibration
[IA64] bugfix stack layout upside-down
[IA64] Fix possible invalid memory access in ia64_setup_msi_irq()
Diffstat (limited to 'arch/ia64/pci/pci.c')
| -rw-r--r-- | arch/ia64/pci/pci.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/ia64/pci/pci.c b/arch/ia64/pci/pci.c index f8bcccd6d41..0e83f3b419b 100644 --- a/arch/ia64/pci/pci.c +++ b/arch/ia64/pci/pci.c @@ -568,7 +568,6 @@ pcibios_disable_device (struct pci_dev *dev) BUG_ON(atomic_read(&dev->enable_cnt)); if (!dev->msi_enabled) acpi_pci_irq_disable(dev); - return 0; } void |