diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-04-18 12:12:14 -0400 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-04-18 12:12:14 -0400 |
| commit | fac56c2df51bc29b07b3c2dcfabf32a015a0522c (patch) | |
| tree | 1ff5d84ecf4ea0bcbd42e2ef9624b5ade3810890 /arch/sh/drivers/pci/pci.c | |
| parent | 6caa15d0b84d2ea688fd31f4f172c8353463e109 (diff) | |
| parent | a6360dd37e1a144ed11e6548371bade559a1e4df (diff) | |
Merge commit 'v2.6.39-rc3' into for-2.6.39
Diffstat (limited to 'arch/sh/drivers/pci/pci.c')
| -rw-r--r-- | arch/sh/drivers/pci/pci.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/sh/drivers/pci/pci.c b/arch/sh/drivers/pci/pci.c index a09c77dd09db..194231cb5a70 100644 --- 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) | |||
| 84 | hose_tail = &hose->next; | 84 | hose_tail = &hose->next; |
| 85 | 85 | ||
| 86 | /* | 86 | /* |
| 87 | * Do not panic here but later - this might hapen before console init. | 87 | * Do not panic here but later - this might happen before console init. |
| 88 | */ | 88 | */ |
| 89 | if (!hose->io_map_base) { | 89 | if (!hose->io_map_base) { |
| 90 | printk(KERN_WARNING | 90 | printk(KERN_WARNING |