git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branches 'release', 'APERF', 'ARAT', 'misc', 'kelvin', 'device-lock' and 'bjorn...
[sfrench/cifs-2.6.git]
/
arch
/
arm
/
mach-orion5x
/
common.c
diff --git
a/arch/arm/mach-orion5x/common.c
b/arch/arm/mach-orion5x/common.c
index 68cc3efae56736a47894c4fd304e55d3f4126012..6af99ddabdfb92e0159ba96252654549dc04b9ce 100644
(file)
--- a/
arch/arm/mach-orion5x/common.c
+++ b/
arch/arm/mach-orion5x/common.c
@@
-463,7
+463,7
@@
static struct platform_device orion5x_xor_shared = {
.resource = orion5x_xor_shared_resources,
};
.resource = orion5x_xor_shared_resources,
};
-static u64 orion5x_xor_dmamask = DMA_
32BIT_MASK
;
+static u64 orion5x_xor_dmamask = DMA_
BIT_MASK(32)
;
static struct resource orion5x_xor0_resources[] = {
[0] = {
static struct resource orion5x_xor0_resources[] = {
[0] = {
@@
-486,7
+486,7
@@
static struct platform_device orion5x_xor0_channel = {
.resource = orion5x_xor0_resources,
.dev = {
.dma_mask = &orion5x_xor_dmamask,
.resource = orion5x_xor0_resources,
.dev = {
.dma_mask = &orion5x_xor_dmamask,
- .coherent_dma_mask = DMA_
64BIT_MASK
,
+ .coherent_dma_mask = DMA_
BIT_MASK(64)
,
.platform_data = (void *)&orion5x_xor0_data,
},
};
.platform_data = (void *)&orion5x_xor0_data,
},
};
@@
-512,7
+512,7
@@
static struct platform_device orion5x_xor1_channel = {
.resource = orion5x_xor1_resources,
.dev = {
.dma_mask = &orion5x_xor_dmamask,
.resource = orion5x_xor1_resources,
.dev = {
.dma_mask = &orion5x_xor_dmamask,
- .coherent_dma_mask = DMA_
64BIT_MASK
,
+ .coherent_dma_mask = DMA_
BIT_MASK(64)
,
.platform_data = (void *)&orion5x_xor1_data,
},
};
.platform_data = (void *)&orion5x_xor1_data,
},
};