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 git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
[pandora-kernel.git]
/
drivers
/
block
/
cpqarray.c
diff --git
a/drivers/block/cpqarray.c
b/drivers/block/cpqarray.c
index
5d39df1
..
ca268ca
100644
(file)
--- a/
drivers/block/cpqarray.c
+++ b/
drivers/block/cpqarray.c
@@
-617,6
+617,7
@@
static int cpqarray_pci_init(ctlr_info_t *c, struct pci_dev *pdev)
int i;
c->pci_dev = pdev;
+ pci_set_master(pdev);
if (pci_enable_device(pdev)) {
printk(KERN_ERR "cpqarray: Unable to Enable PCI device\n");
return -1;