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 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...
[pandora-kernel.git]
/
arch
/
arm
/
mach-s5p6442
/
dma.c
diff --git
a/arch/arm/mach-s5p6442/dma.c
b/arch/arm/mach-s5p6442/dma.c
index
ad4f870
..
7dfb136
100644
(file)
--- a/
arch/arm/mach-s5p6442/dma.c
+++ b/
arch/arm/mach-s5p6442/dma.c
@@
-82,7
+82,7
@@
static struct s3c_pl330_platdata s5p6442_pdma_pdata = {
static struct platform_device s5p6442_device_pdma = {
.name = "s3c-pl330",
- .id = 1,
+ .id =
-
1,
.num_resources = ARRAY_SIZE(s5p6442_pdma_resource),
.resource = s5p6442_pdma_resource,
.dev = {