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
This commit is contained in:
commit
7ec96d446a
|
@ -81,7 +81,7 @@ static int __init sh7751_pci_init(void)
|
||||||
unsigned int id;
|
unsigned int id;
|
||||||
u32 word, reg;
|
u32 word, reg;
|
||||||
|
|
||||||
printk(KERN_NOTICE "PCI: Starting intialization.\n");
|
printk(KERN_NOTICE "PCI: Starting initialization.\n");
|
||||||
|
|
||||||
chan->reg_base = 0xfe200000;
|
chan->reg_base = 0xfe200000;
|
||||||
|
|
||||||
|
|
|
@ -246,7 +246,7 @@ static int __init sh7780_pci_init(void)
|
||||||
const char *type;
|
const char *type;
|
||||||
int ret, i;
|
int ret, i;
|
||||||
|
|
||||||
printk(KERN_NOTICE "PCI: Starting intialization.\n");
|
printk(KERN_NOTICE "PCI: Starting initialization.\n");
|
||||||
|
|
||||||
chan->reg_base = 0xfe040000;
|
chan->reg_base = 0xfe040000;
|
||||||
|
|
||||||
|
|
|
@ -392,7 +392,7 @@ static int __init sh7786_pcie_init(void)
|
||||||
{
|
{
|
||||||
int ret = 0, i;
|
int ret = 0, i;
|
||||||
|
|
||||||
printk(KERN_NOTICE "PCI: Starting intialization.\n");
|
printk(KERN_NOTICE "PCI: Starting initialization.\n");
|
||||||
|
|
||||||
sh7786_pcie_hwops = &sh7786_65nm_pcie_hwops;
|
sh7786_pcie_hwops = &sh7786_65nm_pcie_hwops;
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue