Commit ceb8ef5e authored by Mark Brown's avatar Mark Brown
Browse files

Merge remote-tracking branch 'asoc/topic/samsung' into asoc-next

parents a5034515 a08485d8

arch/arm/mach-exynos/mach-armlex4210.c

+0 −1
Original line number Diff line number Diff line
@@ -147,7 +147,6 @@ static struct platform_device *armlex4210_devices[] __initdata = { 
	&s3c_device_hsmmc3,

	&s3c_device_rtc,

	&s3c_device_wdt,

	&samsung_asoc_dma,

	&armlex4210_smsc911x,

	&exynos4_device_ahci,

};

arch/arm/mach-exynos/mach-smdkv310.c

+0 −1
Original line number Diff line number Diff line
@@ -311,7 +311,6 @@ static struct platform_device *smdkv310_devices[] __initdata = { 
	&s5p_device_mfc_l,

	&s5p_device_mfc_r,

	&exynos4_device_spdif,

	&samsung_asoc_dma,

	&samsung_asoc_idma,

	&s5p_device_fimd0,

	&smdkv310_device_audio,

arch/arm/mach-s3c24xx/mach-gta02.c

+0 −1
Original line number Diff line number Diff line
@@ -521,7 +521,6 @@ static struct platform_device *gta02_devices[] __initdata = { 
	&gta02_nor_flash,

	&s3c24xx_pwm_device,

	&s3c_device_iis,

	&samsung_asoc_dma,

	&s3c_device_i2c0,

	&gta02_dfbmcs320_device,

	&gta02_buttons_device,

arch/arm/mach-s3c24xx/mach-h1940.c

+0 −1
Original line number Diff line number Diff line
@@ -632,7 +632,6 @@ static struct platform_device *h1940_devices[] __initdata = { 
	&s3c_device_wdt,

	&s3c_device_i2c0,

	&s3c_device_iis,

	&samsung_asoc_dma,

	&s3c_device_usbgadget,

	&h1940_device_leds,

	&h1940_device_bluetooth,

arch/arm/mach-s3c24xx/mach-mini2440.c

+0 −1
Original line number Diff line number Diff line
@@ -519,7 +519,6 @@ static struct platform_device *mini2440_devices[] __initdata = { 
	&s3c_device_iis,

	&uda1340_codec,

	&mini2440_audio,

	&samsung_asoc_dma,

};



static void __init mini2440_map_io(void)