Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 295355
b: refs/heads/master
c: 3bf9688
h: refs/heads/master
i:
  295353: bd8342e
  295351: 8852e6a
v: v3
  • Loading branch information
Russell King committed Jan 25, 2012
1 parent e1a33b2 commit dfff861
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 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: 8395e9dd56b6bba01379da8b51a8a02f4dd86fdd
refs/heads/master: 3bf96889976168827eade6788f26391de051e872
6 changes: 3 additions & 3 deletions trunk/arch/arm/mach-u300/core.c
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ static struct amba_device uart0_device = {
.end = U300_UART0_BASE + SZ_4K - 1,
.flags = IORESOURCE_MEM,
},
.irq = { IRQ_U300_UART0, NO_IRQ },
.irq = { IRQ_U300_UART0 },
};

/* The U335 have an additional UART1 on the APP CPU */
Expand All @@ -129,7 +129,7 @@ static struct amba_device uart1_device = {
.end = U300_UART1_BASE + SZ_4K - 1,
.flags = IORESOURCE_MEM,
},
.irq = { IRQ_U300_UART1, NO_IRQ },
.irq = { IRQ_U300_UART1 },
};
#endif

Expand Down Expand Up @@ -160,7 +160,7 @@ static struct amba_device pl022_device = {
.end = U300_SPI_BASE + SZ_4K - 1,
.flags = IORESOURCE_MEM,
},
.irq = {IRQ_U300_SPI, NO_IRQ },
.irq = {IRQ_U300_SPI },
/*
* This device has a DMA channel but the Linux driver does not use
* it currently.
Expand Down

0 comments on commit dfff861

Please sign in to comment.