diff options
author | Takashi Iwai <tiwai@suse.de> | 2013-08-01 11:12:10 +0200 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2013-08-01 11:12:10 +0200 |
commit | 209fb1b7e298c5f5a93a9450bc9e9e7923f745d9 (patch) | |
tree | 27cbfa78e5eeaceb2aae1c165f7f0e24f6fee286 /arch/arm/mach-keystone/keystone.c | |
parent | a8d30608eaed6cc759b8e2e8a8bbbb42591f797f (diff) | |
parent | 3fef7f795fff7ccc58d55a28315ca73305515884 (diff) |
Merge tag 'asoc-v3.11-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus
ASoC: Fixes for v3.11
A fix to make sure userspace knows when control writes have caused a
change in value, fixing some UIs, plus a few few driver fixes mainly
cleaning up issues from recent refactorings on less mainstream platforms.
Diffstat (limited to 'arch/arm/mach-keystone/keystone.c')
-rw-r--r-- | arch/arm/mach-keystone/keystone.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-keystone/keystone.c b/arch/arm/mach-keystone/keystone.c index fe4d9ff93a7e..b661c5c2870a 100644 --- a/arch/arm/mach-keystone/keystone.c +++ b/arch/arm/mach-keystone/keystone.c @@ -49,7 +49,7 @@ static const char *keystone_match[] __initconst = { NULL, }; -void keystone_restart(char mode, const char *cmd) +void keystone_restart(enum reboot_mode mode, const char *cmd) { u32 val; |