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 'sh-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...
[pandora-kernel.git]
/
arch
/
sh
/
drivers
/
pci
/
pci.c
diff --git
a/arch/sh/drivers/pci/pci.c
b/arch/sh/drivers/pci/pci.c
index
a09c77d
..
194231c
100644
(file)
--- a/
arch/sh/drivers/pci/pci.c
+++ b/
arch/sh/drivers/pci/pci.c
@@
-84,7
+84,7
@@
int __devinit register_pci_controller(struct pci_channel *hose)
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