Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 71859
b: refs/heads/master
c: 5b20311
h: refs/heads/master
i:
  71857: 7590a95
  71855: 6564b9a
v: v3
  • Loading branch information
Simon Arlott authored and Adrian Bunk committed Oct 19, 2007
1 parent 49109e6 commit 743cb66
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: b60745b960dc8313400899fcda310ba51604ffb8
refs/heads/master: 5b20311eeae7c5e7d9484cd0878ac756a20a78e4
4 changes: 2 additions & 2 deletions trunk/arch/v850/kernel/me2.c
Original file line number Diff line number Diff line change
Expand Up @@ -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. */
Expand Down
4 changes: 2 additions & 2 deletions trunk/arch/v850/kernel/rte_mb_a_pci.c
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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,
Expand Down

0 comments on commit 743cb66

Please sign in to comment.