git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fedora core 6 1.2949 + vserver 2.2.0
[linux-2.6.git]
/
arch
/
sh64
/
kernel
/
pci_sh5.c
diff --git
a/arch/sh64/kernel/pci_sh5.c
b/arch/sh64/kernel/pci_sh5.c
index
842a243
..
9dae689
100644
(file)
--- a/
arch/sh64/kernel/pci_sh5.c
+++ b/
arch/sh64/kernel/pci_sh5.c
@@
-9,7
+9,6
@@
* Support functions for the SH5 PCI hardware.
*/
* Support functions for the SH5 PCI hardware.
*/
-#include <linux/config.h>
#include <linux/kernel.h>
#include <linux/rwsem.h>
#include <linux/smp.h>
#include <linux/kernel.h>
#include <linux/rwsem.h>
#include <linux/smp.h>
@@
-39,7
+38,7
@@
static void __init pci_fixup_ide_bases(struct pci_dev *d)
*/
if ((d->class >> 8) != PCI_CLASS_STORAGE_IDE)
return;
*/
if ((d->class >> 8) != PCI_CLASS_STORAGE_IDE)
return;
- printk("PCI: IDE base address fixup for %s\n",
d->slot_name
);
+ printk("PCI: IDE base address fixup for %s\n",
pci_name(d)
);
for(i=0; i<4; i++) {
struct resource *r = &d->resource[i];
if ((r->start & ~0x80) == 0x374) {
for(i=0; i<4; i++) {
struct resource *r = &d->resource[i];
if ((r->start & ~0x80) == 0x374) {
@@
-474,13
+473,13
@@
static void __init pcibios_size_bridges(void)
static int __init pcibios_init(void)
{
if (request_irq(IRQ_ERR, pcish5_err_irq,
static int __init pcibios_init(void)
{
if (request_irq(IRQ_ERR, pcish5_err_irq,
-
SA_INTERRUPT
, "PCI Error",NULL) < 0) {
+
IRQF_DISABLED
, "PCI Error",NULL) < 0) {
printk(KERN_ERR "PCISH5: Cannot hook PCI_PERR interrupt\n");
return -EINVAL;
}
if (request_irq(IRQ_SERR, pcish5_serr_irq,
printk(KERN_ERR "PCISH5: Cannot hook PCI_PERR interrupt\n");
return -EINVAL;
}
if (request_irq(IRQ_SERR, pcish5_serr_irq,
-
SA_INTERRUPT
, "PCI SERR interrupt", NULL) < 0) {
+
IRQF_DISABLED
, "PCI SERR interrupt", NULL) < 0) {
printk(KERN_ERR "PCISH5: Cannot hook PCI_SERR interrupt\n");
return -EINVAL;
}
printk(KERN_ERR "PCISH5: Cannot hook PCI_SERR interrupt\n");
return -EINVAL;
}
@@
-517,7
+516,7
@@
void __init pcibios_fixup_bus(struct pci_bus *bus)
bus->resource[0]->flags |= IORESOURCE_IO;
bus->resource[1]->flags |= IORESOURCE_MEM;
bus->resource[0]->flags |= IORESOURCE_IO;
bus->resource[1]->flags |= IORESOURCE_MEM;
- /* For now, prop
o
gate host limits to the bus;
+ /* For now, prop
a
gate host limits to the bus;
* we'll adjust them later. */
#if 1
* we'll adjust them later. */
#if 1