diff options
author | Paul Mundt <lethal@linux-sh.org> | 2010-07-02 00:06:56 -0400 |
---|---|---|
committer | Paul Mundt <lethal@linux-sh.org> | 2010-07-02 00:06:56 -0400 |
commit | 7ec96d446aee72910dab1852dab77b9b18974c45 (patch) | |
tree | 685401953cd1b7db5482b4e0b04a6353c2e0d12f /arch/sh | |
parent | 12462d77ec78be9fb033580b7b64ddf9d0fee44b (diff) | |
parent | 3b554c33dcde9d67efcb8d0a5acca201afd44730 (diff) |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/mfleming/sh-2.6
* 'master' of master.kernel.org:/pub/scm/linux/kernel/git/mfleming/sh-2.6:
sh: Fix typos in PCI initialization message
Diffstat (limited to 'arch/sh')
-rw-r--r-- | arch/sh/drivers/pci/pci-sh7751.c | 2 | ||||
-rw-r--r-- | arch/sh/drivers/pci/pci-sh7780.c | 2 | ||||
-rw-r--r-- | arch/sh/drivers/pci/pcie-sh7786.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/arch/sh/drivers/pci/pci-sh7751.c b/arch/sh/drivers/pci/pci-sh7751.c index f98141b3b7d7..86adb1e235cd 100644 --- a/arch/sh/drivers/pci/pci-sh7751.c +++ b/arch/sh/drivers/pci/pci-sh7751.c | |||
@@ -81,7 +81,7 @@ static int __init sh7751_pci_init(void) | |||
81 | unsigned int id; | 81 | unsigned int id; |
82 | u32 word, reg; | 82 | u32 word, reg; |
83 | 83 | ||
84 | printk(KERN_NOTICE "PCI: Starting intialization.\n"); | 84 | printk(KERN_NOTICE "PCI: Starting initialization.\n"); |
85 | 85 | ||
86 | chan->reg_base = 0xfe200000; | 86 | chan->reg_base = 0xfe200000; |
87 | 87 | ||
diff --git a/arch/sh/drivers/pci/pci-sh7780.c b/arch/sh/drivers/pci/pci-sh7780.c index ffdcbf10b95e..edb7cca14882 100644 --- a/arch/sh/drivers/pci/pci-sh7780.c +++ b/arch/sh/drivers/pci/pci-sh7780.c | |||
@@ -246,7 +246,7 @@ static int __init sh7780_pci_init(void) | |||
246 | const char *type; | 246 | const char *type; |
247 | int ret, i; | 247 | int ret, i; |
248 | 248 | ||
249 | printk(KERN_NOTICE "PCI: Starting intialization.\n"); | 249 | printk(KERN_NOTICE "PCI: Starting initialization.\n"); |
250 | 250 | ||
251 | chan->reg_base = 0xfe040000; | 251 | chan->reg_base = 0xfe040000; |
252 | 252 | ||
diff --git a/arch/sh/drivers/pci/pcie-sh7786.c b/arch/sh/drivers/pci/pcie-sh7786.c index 68cb9b0ac9d2..78f378731858 100644 --- a/arch/sh/drivers/pci/pcie-sh7786.c +++ b/arch/sh/drivers/pci/pcie-sh7786.c | |||
@@ -392,7 +392,7 @@ static int __init sh7786_pcie_init(void) | |||
392 | { | 392 | { |
393 | int ret = 0, i; | 393 | int ret = 0, i; |
394 | 394 | ||
395 | printk(KERN_NOTICE "PCI: Starting intialization.\n"); | 395 | printk(KERN_NOTICE "PCI: Starting initialization.\n"); |
396 | 396 | ||
397 | sh7786_pcie_hwops = &sh7786_65nm_pcie_hwops; | 397 | sh7786_pcie_hwops = &sh7786_65nm_pcie_hwops; |
398 | 398 | ||