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 master.kernel.org:/home/rmk/linux-2.6-arm
[pandora-kernel.git]
/
drivers
/
pci
/
pci.c
diff --git
a/drivers/pci/pci.c
b/drivers/pci/pci.c
index
ccff633
..
992db89
100644
(file)
--- a/
drivers/pci/pci.c
+++ b/
drivers/pci/pci.c
@@
-819,7
+819,7
@@
pci_intx(struct pci_dev *pdev, int enable)
}
if (new != pci_command) {
- pci_write_config_word(pdev, PCI_COMMAND,
pci_command
);
+ pci_write_config_word(pdev, PCI_COMMAND,
new
);
}
}