diff options
-rw-r--r-- | arch/v850/kernel/me2.c | 4 | ||||
-rw-r--r-- | arch/v850/kernel/rte_mb_a_pci.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/arch/v850/kernel/me2.c b/arch/v850/kernel/me2.c index 38be5c194f6b..007115dc9ce0 100644 --- a/arch/v850/kernel/me2.c +++ b/arch/v850/kernel/me2.c | |||
@@ -58,13 +58,13 @@ void __init me2_init_irqs (void) | |||
58 | void me2_uart_pre_configure (unsigned chan, unsigned cflags, unsigned baud) | 58 | void me2_uart_pre_configure (unsigned chan, unsigned cflags, unsigned baud) |
59 | { | 59 | { |
60 | if (chan == 0) { | 60 | if (chan == 0) { |
61 | /* Specify that the relevent pins on the chip should do | 61 | /* Specify that the relevant pins on the chip should do |
62 | serial I/O, not direct I/O. */ | 62 | serial I/O, not direct I/O. */ |
63 | ME2_PORT1_PMC |= 0xC; | 63 | ME2_PORT1_PMC |= 0xC; |
64 | /* Specify that we're using the UART, not the CSI device. */ | 64 | /* Specify that we're using the UART, not the CSI device. */ |
65 | ME2_PORT1_PFC |= 0xC; | 65 | ME2_PORT1_PFC |= 0xC; |
66 | } else if (chan == 1) { | 66 | } else if (chan == 1) { |
67 | /* Specify that the relevent pins on the chip should do | 67 | /* Specify that the relevant pins on the chip should do |
68 | serial I/O, not direct I/O. */ | 68 | serial I/O, not direct I/O. */ |
69 | ME2_PORT2_PMC |= 0x6; | 69 | ME2_PORT2_PMC |= 0x6; |
70 | /* Specify that we're using the UART, not the CSI device. */ | 70 | /* Specify that we're using the UART, not the CSI device. */ |
diff --git a/arch/v850/kernel/rte_mb_a_pci.c b/arch/v850/kernel/rte_mb_a_pci.c index 35a4bd5515cb..7165478824e7 100644 --- a/arch/v850/kernel/rte_mb_a_pci.c +++ b/arch/v850/kernel/rte_mb_a_pci.c | |||
@@ -179,7 +179,7 @@ static int __devinit pcibios_init (void) | |||
179 | default uses. */ | 179 | default uses. */ |
180 | 180 | ||
181 | /* Significant address bits used for decoding PCI GCS5 space | 181 | /* Significant address bits used for decoding PCI GCS5 space |
182 | accessess. */ | 182 | accesses. */ |
183 | MB_A_PCI_DMRR = ~(MB_A_PCI_MEM_SIZE - 1); | 183 | MB_A_PCI_DMRR = ~(MB_A_PCI_MEM_SIZE - 1); |
184 | 184 | ||
185 | /* I don't understand this, but the SolutionGear example code | 185 | /* 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) | |||
775 | /* Free and unmap a consistent DMA buffer. CPU_ADDR and DMA_ADDR must | 775 | /* Free and unmap a consistent DMA buffer. CPU_ADDR and DMA_ADDR must |
776 | be values that were returned from pci_alloc_consistent. SIZE must be | 776 | be values that were returned from pci_alloc_consistent. SIZE must be |
777 | the same as what as passed into pci_alloc_consistent. References to | 777 | the same as what as passed into pci_alloc_consistent. References to |
778 | the memory and mappings assosciated with CPU_ADDR or DMA_ADDR past | 778 | the memory and mappings associated with CPU_ADDR or DMA_ADDR past |
779 | this call are illegal. */ | 779 | this call are illegal. */ |
780 | void | 780 | void |
781 | pci_free_consistent (struct pci_dev *pdev, size_t size, void *cpu_addr, | 781 | pci_free_consistent (struct pci_dev *pdev, size_t size, void *cpu_addr, |