diff options
author | David S. Miller <davem@davemloft.net> | 2012-10-02 23:02:10 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2012-10-02 23:02:10 -0400 |
commit | 954f9ac43b87b44152b8c21163cefd466a87145e (patch) | |
tree | 31c4197f975c66c96976948663e6ce844900b41a /arch/sparc/kernel/leon_pci.c | |
parent | 1b62ca7bf5775bed048032b7e779561e1fe66aa0 (diff) | |
parent | 7fe0b14b725d6d09a1d9e1409bd465cb88b587f9 (diff) |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux
There's a Niagara 2 memcpy fix in this tree and I have
a Kconfig fix from Dave Jones which requires the sparc-next
changes which went upstream yesterday.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'arch/sparc/kernel/leon_pci.c')
-rw-r--r-- | arch/sparc/kernel/leon_pci.c | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/arch/sparc/kernel/leon_pci.c b/arch/sparc/kernel/leon_pci.c index 21dcda75a520..fc0521161568 100644 --- a/arch/sparc/kernel/leon_pci.c +++ b/arch/sparc/kernel/leon_pci.c | |||
@@ -102,15 +102,6 @@ int pcibios_enable_device(struct pci_dev *dev, int mask) | |||
102 | return pci_enable_resources(dev, mask); | 102 | return pci_enable_resources(dev, mask); |
103 | } | 103 | } |
104 | 104 | ||
105 | void __devinit pcibios_update_irq(struct pci_dev *dev, int irq) | ||
106 | { | ||
107 | #ifdef CONFIG_PCI_DEBUG | ||
108 | printk(KERN_DEBUG "LEONPCI: Assigning IRQ %02d to %s\n", irq, | ||
109 | pci_name(dev)); | ||
110 | #endif | ||
111 | pci_write_config_byte(dev, PCI_INTERRUPT_LINE, irq); | ||
112 | } | ||
113 | |||
114 | /* in/out routines taken from pcic.c | 105 | /* in/out routines taken from pcic.c |
115 | * | 106 | * |
116 | * This probably belongs here rather than ioport.c because | 107 | * This probably belongs here rather than ioport.c because |