From 743cb66d662824228bdb10b395ab5771ef419b00 Mon Sep 17 00:00:00 2001 From: Simon Arlott Date: Sat, 20 Oct 2007 01:24:05 +0200 Subject: [PATCH] --- yaml --- r: 71859 b: refs/heads/master c: 5b20311eeae7c5e7d9484cd0878ac756a20a78e4 h: refs/heads/master i: 71857: 7590a9541b93bf84ff57bf44cd31304bb4c4bd75 71855: 6564b9ad3fcf8d57c8c3dc87b9b57adfc690b9f3 v: v3 --- [refs] | 2 +- trunk/arch/v850/kernel/me2.c | 4 ++-- trunk/arch/v850/kernel/rte_mb_a_pci.c | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 12d895f34b39..2a9c68db6b7f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b60745b960dc8313400899fcda310ba51604ffb8 +refs/heads/master: 5b20311eeae7c5e7d9484cd0878ac756a20a78e4 diff --git a/trunk/arch/v850/kernel/me2.c b/trunk/arch/v850/kernel/me2.c index 38be5c194f6b..007115dc9ce0 100644 --- a/trunk/arch/v850/kernel/me2.c +++ b/trunk/arch/v850/kernel/me2.c @@ -58,13 +58,13 @@ void __init me2_init_irqs (void) void me2_uart_pre_configure (unsigned chan, unsigned cflags, unsigned baud) { if (chan == 0) { - /* Specify that the relevent pins on the chip should do + /* Specify that the relevant pins on the chip should do serial I/O, not direct I/O. */ ME2_PORT1_PMC |= 0xC; /* Specify that we're using the UART, not the CSI device. */ ME2_PORT1_PFC |= 0xC; } else if (chan == 1) { - /* Specify that the relevent pins on the chip should do + /* Specify that the relevant pins on the chip should do serial I/O, not direct I/O. */ ME2_PORT2_PMC |= 0x6; /* Specify that we're using the UART, not the CSI device. */ diff --git a/trunk/arch/v850/kernel/rte_mb_a_pci.c b/trunk/arch/v850/kernel/rte_mb_a_pci.c index 35a4bd5515cb..7165478824e7 100644 --- a/trunk/arch/v850/kernel/rte_mb_a_pci.c +++ b/trunk/arch/v850/kernel/rte_mb_a_pci.c @@ -179,7 +179,7 @@ static int __devinit pcibios_init (void) default uses. */ /* Significant address bits used for decoding PCI GCS5 space - accessess. */ + accesses. */ MB_A_PCI_DMRR = ~(MB_A_PCI_MEM_SIZE - 1); /* I don't understand this, but the SolutionGear example code @@ -775,7 +775,7 @@ pci_alloc_consistent (struct pci_dev *pdev, size_t size, dma_addr_t *dma_addr) /* Free and unmap a consistent DMA buffer. CPU_ADDR and DMA_ADDR must be values that were returned from pci_alloc_consistent. SIZE must be the same as what as passed into pci_alloc_consistent. References to - the memory and mappings assosciated with CPU_ADDR or DMA_ADDR past + the memory and mappings associated with CPU_ADDR or DMA_ADDR past this call are illegal. */ void pci_free_consistent (struct pci_dev *pdev, size_t size, void *cpu_addr,