git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux...
[pandora-kernel.git]
/
drivers
/
scsi
/
megaraid
/
megaraid_mbox.c
diff --git
a/drivers/scsi/megaraid/megaraid_mbox.c
b/drivers/scsi/megaraid/megaraid_mbox.c
index
bec1424
..
9271513
100644
(file)
--- a/
drivers/scsi/megaraid/megaraid_mbox.c
+++ b/
drivers/scsi/megaraid/megaraid_mbox.c
@@
-714,7
+714,7
@@
megaraid_io_detach(adapter_t *adapter)
* . Allocate memory required for all the commands
* . Use internal library of FW routines, build up complete soft state
*/
* . Allocate memory required for all the commands
* . Use internal library of FW routines, build up complete soft state
*/
-static int __init
+static int __
dev
init
megaraid_init_mbox(adapter_t *adapter)
{
struct pci_dev *pdev;
megaraid_init_mbox(adapter_t *adapter)
{
struct pci_dev *pdev;
@@
-767,7
+767,7
@@
megaraid_init_mbox(adapter_t *adapter)
//
// request IRQ and register the interrupt service routine
//
// request IRQ and register the interrupt service routine
- if (request_irq(adapter->irq, megaraid_isr,
SA_SHIRQ
, "megaraid",
+ if (request_irq(adapter->irq, megaraid_isr,
IRQF_SHARED
, "megaraid",
adapter)) {
con_log(CL_ANN, (KERN_WARNING
adapter)) {
con_log(CL_ANN, (KERN_WARNING