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 'for-3.1' into for-3.2
[cascardo/linux.git]
/
arch
/
arm
/
mach-s5pc100
/
dev-audio.c
diff --git
a/arch/arm/mach-s5pc100/dev-audio.c
b/arch/arm/mach-s5pc100/dev-audio.c
index
10ab275
..
ab2d271
100644
(file)
--- a/
arch/arm/mach-s5pc100/dev-audio.c
+++ b/
arch/arm/mach-s5pc100/dev-audio.c
@@
-281,7
+281,7
@@
static struct s3c_audio_pdata s3c_ac97_pdata = {
static u64 s5pc100_ac97_dmamask = DMA_BIT_MASK(32);
struct platform_device s5pc100_device_ac97 = {
- .name = "s
3c
-ac97",
+ .name = "s
amsung
-ac97",
.id = -1,
.num_resources = ARRAY_SIZE(s5pc100_ac97_resource),
.resource = s5pc100_ac97_resource,