diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-09-20 12:12:10 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-09-20 12:12:10 +1000 |
| commit | 422d2f7b26f5c6ebbd48b58a70cccb205d2cac44 (patch) | |
| tree | 79785059172325c5c238d09686dc784d741be86b /arch/sh | |
| parent | dbca064ee335eba7bb61cff9965464967e447069 (diff) | |
| parent | b9fde18c0582583cf12a4b1c02f621d3addd0a97 (diff) | |
Merge remote branch 'sound-asoc/for-next'
Conflicts:
arch/arm/mach-s3c64xx/mach-smdk6410.c
drivers/video/sh_mobile_hdmi.c
Diffstat (limited to 'arch/sh')
| -rw-r--r-- | arch/sh/kernel/cpu/sh4a/setup-sh7722.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/sh/kernel/cpu/sh4a/setup-sh7722.c b/arch/sh/kernel/cpu/sh4a/setup-sh7722.c index 156ccc960015..d551ed8dea95 100644 --- a/arch/sh/kernel/cpu/sh4a/setup-sh7722.c +++ b/arch/sh/kernel/cpu/sh4a/setup-sh7722.c @@ -551,7 +551,7 @@ static struct resource siu_resources[] = { }; static struct platform_device siu_device = { - .name = "sh_siu", + .name = "siu-pcm-audio", .id = -1, .dev = { .platform_data = &siu_platform_data, |