aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/base/platform.c
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2013-07-24 05:42:34 -0400
committerTakashi Iwai <tiwai@suse.de>2013-07-24 05:42:34 -0400
commit43cbd286fbba4bfb0c2ef05dc62522dfd5a2c000 (patch)
tree7184a24f04c72987e725e50e66db530e6f618220 /drivers/base/platform.c
parentfee4b700a4e9e446151eb5a03874ca8666323113 (diff)
parentc5ae4dca11523dff15cfb1763b64a71b805976aa (diff)
Merge tag 'asoc-v3.11-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus
ASoC: Updates for v3.11 A few small updates again, the sgtl5000 one fixes some newly triggered issues due to some probe ordering changes which were introduced in the last merge window.
Diffstat (limited to 'drivers/base/platform.c')
-rw-r--r--drivers/base/platform.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/base/platform.c b/drivers/base/platform.c
index 15789875128e..3c3197a8de41 100644
--- a/drivers/base/platform.c
+++ b/drivers/base/platform.c
@@ -522,6 +522,7 @@ static void platform_drv_shutdown(struct device *_dev)
522/** 522/**
523 * __platform_driver_register - register a driver for platform-level devices 523 * __platform_driver_register - register a driver for platform-level devices
524 * @drv: platform driver structure 524 * @drv: platform driver structure
525 * @owner: owning module/driver
525 */ 526 */
526int __platform_driver_register(struct platform_driver *drv, 527int __platform_driver_register(struct platform_driver *drv,
527 struct module *owner) 528 struct module *owner)