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 'stable/bug-fixes-rc2' of git://git.kernel.org/pub/scm/linux/kernel...
[pandora-kernel.git]
/
arch
/
mips
/
pci
/
pci.c
diff --git
a/arch/mips/pci/pci.c
b/arch/mips/pci/pci.c
index
38bc280
..
33bba7b
100644
(file)
--- a/
arch/mips/pci/pci.c
+++ b/
arch/mips/pci/pci.c
@@
-125,7
+125,7
@@
void __devinit register_pci_controller(struct pci_controller *hose)
hose_tail = &hose->next;
/*
hose_tail = &hose->next;
/*
- * Do not panic here but later - this might hapen before console init.
+ * Do not panic here but later - this might hap
p
en before console init.
*/
if (!hose->io_map_base) {
printk(KERN_WARNING
*/
if (!hose->io_map_base) {
printk(KERN_WARNING