diff options
| author | David S. Miller <davem@davemloft.net> | 2009-12-12 02:12:17 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-12-12 02:12:17 +0100 |
| commit | 501706565b2d4d2d40d0d301d5411ede099b8a6f (patch) | |
| tree | 142a18bf1f1e74a09dbfa27540b893ade0fd797d /arch/arm/mach-orion5x/pci.c | |
| parent | net: Handle NETREG_UNINITIALIZED devices correctly (diff) | |
| parent | Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/davej/cp... (diff) | |
| download | linux-501706565b2d4d2d40d0d301d5411ede099b8a6f.tar.xz linux-501706565b2d4d2d40d0d301d5411ede099b8a6f.zip | |
Merge branch 'master' of /home/davem/src/GIT/linux-2.6/
Conflicts:
include/net/tcp.h
Diffstat (limited to 'arch/arm/mach-orion5x/pci.c')
| -rw-r--r-- | arch/arm/mach-orion5x/pci.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-orion5x/pci.c b/arch/arm/mach-orion5x/pci.c index 36dc5413cc97..bdf96eb523bc 100644 --- a/arch/arm/mach-orion5x/pci.c +++ b/arch/arm/mach-orion5x/pci.c @@ -463,7 +463,7 @@ static void __init orion5x_setup_pci_wins(struct mbus_dram_target_info *dram) writel(win_enable, PCI_BAR_ENABLE); /* - * Disable automatic update of address remaping when writing to BARs. + * Disable automatic update of address remapping when writing to BARs. */ orion5x_setbits(PCI_ADDR_DECODE_CTRL, 1); } |