diff options
Diffstat (limited to 'arch/arm')
| -rw-r--r-- | arch/arm/mach-s3c64xx/dev-audio.c | 2 | ||||
| -rw-r--r-- | arch/arm/plat-s3c24xx/devs.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-s3c64xx/dev-audio.c b/arch/arm/mach-s3c64xx/dev-audio.c index 7618627b98f5..bbaf7b3fa8ae 100644 --- a/arch/arm/mach-s3c64xx/dev-audio.c +++ b/arch/arm/mach-s3c64xx/dev-audio.c | |||
| @@ -319,7 +319,7 @@ void __init s3c64xx_ac97_setup_gpio(int num) | |||
| 319 | static u64 s3c_device_audio_dmamask = 0xffffffffUL; | 319 | static u64 s3c_device_audio_dmamask = 0xffffffffUL; |
| 320 | 320 | ||
| 321 | struct platform_device s3c_device_pcm = { | 321 | struct platform_device s3c_device_pcm = { |
| 322 | .name = "s3c24xx-pcm-audio", | 322 | .name = "samsung-audio", |
| 323 | .id = -1, | 323 | .id = -1, |
| 324 | .dev = { | 324 | .dev = { |
| 325 | .dma_mask = &s3c_device_audio_dmamask, | 325 | .dma_mask = &s3c_device_audio_dmamask, |
diff --git a/arch/arm/plat-s3c24xx/devs.c b/arch/arm/plat-s3c24xx/devs.c index 2f91057a0c02..4bf0b3912a69 100644 --- a/arch/arm/plat-s3c24xx/devs.c +++ b/arch/arm/plat-s3c24xx/devs.c | |||
| @@ -264,7 +264,7 @@ EXPORT_SYMBOL(s3c_device_iis); | |||
| 264 | static u64 s3c_device_audio_dmamask = 0xffffffffUL; | 264 | static u64 s3c_device_audio_dmamask = 0xffffffffUL; |
| 265 | 265 | ||
| 266 | struct platform_device s3c_device_pcm = { | 266 | struct platform_device s3c_device_pcm = { |
| 267 | .name = "s3c24xx-pcm-audio", | 267 | .name = "samsung-audio", |
| 268 | .id = -1, | 268 | .id = -1, |
| 269 | .dev = { | 269 | .dev = { |
| 270 | .dma_mask = &s3c_device_audio_dmamask, | 270 | .dma_mask = &s3c_device_audio_dmamask, |