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 'for-2.6.30' into for-2.6.31
[pandora-kernel.git]
/
arch
/
arm
/
plat-iop
/
adma.c
diff --git
a/arch/arm/plat-iop/adma.c
b/arch/arm/plat-iop/adma.c
index
f724208
..
3c127aa
100644
(file)
--- a/
arch/arm/plat-iop/adma.c
+++ b/
arch/arm/plat-iop/adma.c
@@
-119,7
+119,7
@@
static struct resource iop3xx_aau_resources[] = {
}
};
}
};
-static u64 iop3xx_adma_dmamask = DMA_
32BIT_MASK
;
+static u64 iop3xx_adma_dmamask = DMA_
BIT_MASK(32)
;
static struct iop_adma_platform_data iop3xx_dma_0_data = {
.hw_id = DMA0_ID,
static struct iop_adma_platform_data iop3xx_dma_0_data = {
.hw_id = DMA0_ID,
@@
-143,7
+143,7
@@
struct platform_device iop3xx_dma_0_channel = {
.resource = iop3xx_dma_0_resources,
.dev = {
.dma_mask = &iop3xx_adma_dmamask,
.resource = iop3xx_dma_0_resources,
.dev = {
.dma_mask = &iop3xx_adma_dmamask,
- .coherent_dma_mask = DMA_
64BIT_MASK
,
+ .coherent_dma_mask = DMA_
BIT_MASK(64)
,
.platform_data = (void *) &iop3xx_dma_0_data,
},
};
.platform_data = (void *) &iop3xx_dma_0_data,
},
};
@@
-155,7
+155,7
@@
struct platform_device iop3xx_dma_1_channel = {
.resource = iop3xx_dma_1_resources,
.dev = {
.dma_mask = &iop3xx_adma_dmamask,
.resource = iop3xx_dma_1_resources,
.dev = {
.dma_mask = &iop3xx_adma_dmamask,
- .coherent_dma_mask = DMA_
64BIT_MASK
,
+ .coherent_dma_mask = DMA_
BIT_MASK(64)
,
.platform_data = (void *) &iop3xx_dma_1_data,
},
};
.platform_data = (void *) &iop3xx_dma_1_data,
},
};
@@
-167,7
+167,7
@@
struct platform_device iop3xx_aau_channel = {
.resource = iop3xx_aau_resources,
.dev = {
.dma_mask = &iop3xx_adma_dmamask,
.resource = iop3xx_aau_resources,
.dev = {
.dma_mask = &iop3xx_adma_dmamask,
- .coherent_dma_mask = DMA_
64BIT_MASK
,
+ .coherent_dma_mask = DMA_
BIT_MASK(64)
,
.platform_data = (void *) &iop3xx_aau_data,
},
};
.platform_data = (void *) &iop3xx_aau_data,
},
};