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
Merge to Fedora kernel-2.6.18-1.2224_FC5 patched with stable patch-2.6.18.1-vs2.0...
[linux-2.6.git]
/
arch
/
sh
/
drivers
/
pci
/
pci-st40.c
diff --git
a/arch/sh/drivers/pci/pci-st40.c
b/arch/sh/drivers/pci/pci-st40.c
index
cb67521
..
7c81b8b
100644
(file)
--- a/
arch/sh/drivers/pci/pci-st40.c
+++ b/
arch/sh/drivers/pci/pci-st40.c
@@
-7,7
+7,6
@@
* Support functions for the ST40 PCI hardware.
*/
* Support functions for the ST40 PCI hardware.
*/
-#include <linux/config.h>
#include <linux/kernel.h>
#include <linux/smp.h>
#include <linux/smp_lock.h>
#include <linux/kernel.h>
#include <linux/smp.h>
#include <linux/smp_lock.h>
@@
-448,7
+447,7
@@
static int __init pcibios_init(void)
PHYSADDR(memory_end) - PHYSADDR(memory_start));
if (request_irq(ST40PCI_ERR_IRQ, st40_pci_irq,
PHYSADDR(memory_end) - PHYSADDR(memory_start));
if (request_irq(ST40PCI_ERR_IRQ, st40_pci_irq,
-
SA_INTERRUPT
, "st40pci", NULL)) {
+
IRQF_DISABLED
, "st40pci", NULL)) {
printk(KERN_ERR "st40pci: Cannot hook interrupt\n");
return -EIO;
}
printk(KERN_ERR "st40pci: Cannot hook interrupt\n");
return -EIO;
}