projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'fix/asoc' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6
[cascardo/linux.git]
/
arch
/
arm
/
mach-s5p64x0
/
dma.c
diff --git
a/arch/arm/mach-s5p64x0/dma.c
b/arch/arm/mach-s5p64x0/dma.c
index
29a8c24
..
d7ad944
100644
(file)
--- a/
arch/arm/mach-s5p64x0/dma.c
+++ b/
arch/arm/mach-s5p64x0/dma.c
@@
-122,7
+122,7
@@
static struct s3c_pl330_platdata s5p6450_pdma_pdata = {
static struct platform_device s5p64x0_device_pdma = {
.name = "s3c-pl330",
- .id =
0
,
+ .id =
-1
,
.num_resources = ARRAY_SIZE(s5p64x0_pdma_resource),
.resource = s5p64x0_pdma_resource,
.dev = {