diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2017-04-20 15:55:28 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2017-04-20 15:55:28 +1000 |
| commit | 742bb87ba1769b20d0cc69459ec70227388818aa (patch) | |
| tree | 8eb642eed7ec67dd7d2c7e9f4b16a12111488e80 /arch/arm/mach-ixp4xx/common-pci.c | |
| parent | 96ea0159c4161a92a1727fb06db44257b8e74ce4 (diff) | |
| parent | 7370e0f939cf6836fd02b535db16929d8844eb95 (diff) | |
| download | linux-next-742bb87ba1769b20d0cc69459ec70227388818aa.tar.gz | |
Merge branch 'akpm/master'
Diffstat (limited to 'arch/arm/mach-ixp4xx/common-pci.c')
| -rw-r--r-- | arch/arm/mach-ixp4xx/common-pci.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-ixp4xx/common-pci.c b/arch/arm/mach-ixp4xx/common-pci.c index 4977296f0c78..bcf3df59f71b 100644 --- a/arch/arm/mach-ixp4xx/common-pci.c +++ b/arch/arm/mach-ixp4xx/common-pci.c @@ -43,14 +43,14 @@ int (*ixp4xx_pci_read)(u32 addr, u32 cmd, u32* data); /* - * Base address for PCI regsiter region + * Base address for PCI register region */ unsigned long ixp4xx_pci_reg_base = 0; /* * PCI cfg an I/O routines are done by programming a * command/byte enable register, and then read/writing - * the data from a data regsiter. We need to ensure + * the data from a data register. We need to ensure * these transactions are atomic or we will end up * with corrupt data on the bus or in a driver. */ |