diff options
author | Takashi Iwai <tiwai@suse.de> | 2012-07-19 08:21:40 +0200 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2012-07-19 08:21:57 +0200 |
commit | 1558eb838ff502faafacf26b6a711dbaae796009 (patch) | |
tree | 8049ea20a214033369725ed58b8b4a3ca4110887 /sound/sh/aica.c | |
parent | 4609ed6b1f0ab9f11a9d0361573b53d9d057c440 (diff) | |
parent | 81fcb170852d58d7ebd8101a8ef970c82056426e (diff) |
Merge branch 'topic/pm-convert' into for-next
This merges the changes for converting to new PM ops for platform
and some other drivers.
Also move some header files to local places from the public
include/sound.
Diffstat (limited to 'sound/sh/aica.c')
-rw-r--r-- | sound/sh/aica.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/sound/sh/aica.c b/sound/sh/aica.c index 391a38ca58bc..d48b523207eb 100644 --- a/sound/sh/aica.c +++ b/sound/sh/aica.c @@ -654,7 +654,9 @@ static struct platform_driver snd_aica_driver = { .probe = snd_aica_probe, .remove = __devexit_p(snd_aica_remove), .driver = { - .name = SND_AICA_DRIVER}, + .name = SND_AICA_DRIVER, + .owner = THIS_MODULE, + }, }; static int __init aica_init(void) |