From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Fri, 9 Dec 2011 02:26:58 +0000 (+1100)
Subject: Merge remote-tracking branch 'sound/for-next'
X-Git-Tag: next-20111209~50
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=63f164795c4f7c089b8042e05867bd7fc0f9951f;p=karo-tx-linux.git

Merge remote-tracking branch 'sound/for-next'

Conflicts:
	arch/arm/mach-s3c64xx/mach-crag6410.c
---

63f164795c4f7c089b8042e05867bd7fc0f9951f
diff --cc arch/arm/mach-s3c64xx/mach-crag6410.c
index 6ff76c0d9d5c,55c0e75f5edc..85b79ec827d8
--- a/arch/arm/mach-s3c64xx/mach-crag6410.c
+++ b/arch/arm/mach-s3c64xx/mach-crag6410.c
@@@ -346,8 -338,7 +346,8 @@@ static struct platform_device *crag6410
  	&crag6410_lcd_powerdev,
  	&crag6410_backlight_device,
  	&speyside_device,
- 	&speyside_wm8962_device,
+ 	&tobermory_device,
 +	&littlemill_device,
  	&lowland_device,
  	&wallvdd_device,
  };
diff --cc sound/soc/au1x/db1200.c
index 44ad11827364,80733331733f..ec725f63a26a
--- a/sound/soc/au1x/db1200.c
+++ b/sound/soc/au1x/db1200.c
@@@ -202,19 -133,8 +202,8 @@@ static struct platform_driver db1200_au
  	.remove		= __devexit_p(db1200_audio_remove),
  };
  
- static int __init db1200_audio_load(void)
- {
- 	return platform_driver_register(&db1200_audio_driver);
- }
- 
- static void __exit db1200_audio_unload(void)
- {
- 	platform_driver_unregister(&db1200_audio_driver);
- }
- 
- module_init(db1200_audio_load);
- module_exit(db1200_audio_unload);
+ module_platform_driver(db1200_audio_driver);
  
  MODULE_LICENSE("GPL");
 -MODULE_DESCRIPTION("DB1200 ASoC audio support");
 +MODULE_DESCRIPTION("DB1200/DB1300/DB1550 ASoC audio support");
  MODULE_AUTHOR("Manuel Lauss");