diff options
author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-12-09 10:22:17 -0500 |
---|---|---|
committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-12-09 10:22:17 -0500 |
commit | ceb8ef5e6dd55ddcfd875262f83c824f01f02181 (patch) | |
tree | bb2a860519449e5a8b28eefb3f52dbfbbda3529a /arch/arm/mach-s3c24xx | |
parent | a50345152e9f66e3bc7847c58980b55f5ff7bec4 (diff) | |
parent | a08485d8fdf6f67ca5f173b68d8f873c574745f2 (diff) |
Merge remote-tracking branch 'asoc/topic/samsung' into asoc-next
Diffstat (limited to 'arch/arm/mach-s3c24xx')
-rw-r--r-- | arch/arm/mach-s3c24xx/mach-gta02.c | 1 | ||||
-rw-r--r-- | arch/arm/mach-s3c24xx/mach-h1940.c | 1 | ||||
-rw-r--r-- | arch/arm/mach-s3c24xx/mach-mini2440.c | 1 | ||||
-rw-r--r-- | arch/arm/mach-s3c24xx/mach-rx1950.c | 1 |
4 files changed, 0 insertions, 4 deletions
diff --git a/arch/arm/mach-s3c24xx/mach-gta02.c b/arch/arm/mach-s3c24xx/mach-gta02.c index 4a963467b7ee..973b87ca87f4 100644 --- a/arch/arm/mach-s3c24xx/mach-gta02.c +++ b/arch/arm/mach-s3c24xx/mach-gta02.c | |||
@@ -521,7 +521,6 @@ static struct platform_device *gta02_devices[] __initdata = { | |||
521 | >a02_nor_flash, | 521 | >a02_nor_flash, |
522 | &s3c24xx_pwm_device, | 522 | &s3c24xx_pwm_device, |
523 | &s3c_device_iis, | 523 | &s3c_device_iis, |
524 | &samsung_asoc_dma, | ||
525 | &s3c_device_i2c0, | 524 | &s3c_device_i2c0, |
526 | >a02_dfbmcs320_device, | 525 | >a02_dfbmcs320_device, |
527 | >a02_buttons_device, | 526 | >a02_buttons_device, |
diff --git a/arch/arm/mach-s3c24xx/mach-h1940.c b/arch/arm/mach-s3c24xx/mach-h1940.c index 63aaf076f611..b23dd1b106e8 100644 --- a/arch/arm/mach-s3c24xx/mach-h1940.c +++ b/arch/arm/mach-s3c24xx/mach-h1940.c | |||
@@ -632,7 +632,6 @@ static struct platform_device *h1940_devices[] __initdata = { | |||
632 | &s3c_device_wdt, | 632 | &s3c_device_wdt, |
633 | &s3c_device_i2c0, | 633 | &s3c_device_i2c0, |
634 | &s3c_device_iis, | 634 | &s3c_device_iis, |
635 | &samsung_asoc_dma, | ||
636 | &s3c_device_usbgadget, | 635 | &s3c_device_usbgadget, |
637 | &h1940_device_leds, | 636 | &h1940_device_leds, |
638 | &h1940_device_bluetooth, | 637 | &h1940_device_bluetooth, |
diff --git a/arch/arm/mach-s3c24xx/mach-mini2440.c b/arch/arm/mach-s3c24xx/mach-mini2440.c index 393c0f1ac11a..a31d5b83e5f7 100644 --- a/arch/arm/mach-s3c24xx/mach-mini2440.c +++ b/arch/arm/mach-s3c24xx/mach-mini2440.c | |||
@@ -519,7 +519,6 @@ static struct platform_device *mini2440_devices[] __initdata = { | |||
519 | &s3c_device_iis, | 519 | &s3c_device_iis, |
520 | &uda1340_codec, | 520 | &uda1340_codec, |
521 | &mini2440_audio, | 521 | &mini2440_audio, |
522 | &samsung_asoc_dma, | ||
523 | }; | 522 | }; |
524 | 523 | ||
525 | static void __init mini2440_map_io(void) | 524 | static void __init mini2440_map_io(void) |
diff --git a/arch/arm/mach-s3c24xx/mach-rx1950.c b/arch/arm/mach-s3c24xx/mach-rx1950.c index 379fde521d37..0606f2faaa5c 100644 --- a/arch/arm/mach-s3c24xx/mach-rx1950.c +++ b/arch/arm/mach-s3c24xx/mach-rx1950.c | |||
@@ -712,7 +712,6 @@ static struct platform_device *rx1950_devices[] __initdata = { | |||
712 | &s3c_device_wdt, | 712 | &s3c_device_wdt, |
713 | &s3c_device_i2c0, | 713 | &s3c_device_i2c0, |
714 | &s3c_device_iis, | 714 | &s3c_device_iis, |
715 | &samsung_asoc_dma, | ||
716 | &s3c_device_usbgadget, | 715 | &s3c_device_usbgadget, |
717 | &s3c_device_rtc, | 716 | &s3c_device_rtc, |
718 | &s3c_device_nand, | 717 | &s3c_device_nand, |