git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'unlikely/sched' of git://git.kernel.org/pub/scm/linux/kernel/git/rosted...
[pandora-kernel.git]
/
arch
/
arm
/
mach-davinci
/
dm365.c
diff --git
a/arch/arm/mach-davinci/dm365.c
b/arch/arm/mach-davinci/dm365.c
index
02d2cc3
..
4604e72
100644
(file)
--- a/
arch/arm/mach-davinci/dm365.c
+++ b/
arch/arm/mach-davinci/dm365.c
@@
-625,6
+625,7
@@
static u64 dm365_spi0_dma_mask = DMA_BIT_MASK(32);
static struct davinci_spi_platform_data dm365_spi0_pdata = {
.version = SPI_VERSION_1,
.num_chipselect = 2,
static struct davinci_spi_platform_data dm365_spi0_pdata = {
.version = SPI_VERSION_1,
.num_chipselect = 2,
+ .dma_event_q = EVENTQ_3,
};
static struct resource dm365_spi0_resources[] = {
};
static struct resource dm365_spi0_resources[] = {
@@
-645,10
+646,6
@@
static struct resource dm365_spi0_resources[] = {
.start = 16,
.flags = IORESOURCE_DMA,
},
.start = 16,
.flags = IORESOURCE_DMA,
},
- {
- .start = EVENTQ_3,
- .flags = IORESOURCE_DMA,
- },
};
static struct platform_device dm365_spi0_device = {
};
static struct platform_device dm365_spi0_device = {