summaryrefslogtreecommitdiffstats
path: root/drivers/mfd/twl4030-audio.c
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-03-22 00:07:34 +0100
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-03-22 00:07:34 +0100
commit23a376f98c5dcfc392d47e8d1872884ff44e585d (patch)
treedbe476151bbd6530369c40746f2ec2365f7b500a /drivers/mfd/twl4030-audio.c
parentdriver: tty: vt: remove cast for kmalloc return value (diff)
parentLinux 3.9-rc3 (diff)
downloadlinux-23a376f98c5dcfc392d47e8d1872884ff44e585d.tar.xz
linux-23a376f98c5dcfc392d47e8d1872884ff44e585d.zip
Merge 3.9-rc3 into tty-next
Diffstat (limited to 'drivers/mfd/twl4030-audio.c')
-rw-r--r--drivers/mfd/twl4030-audio.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/mfd/twl4030-audio.c b/drivers/mfd/twl4030-audio.c
index e16edca92670..d2ab222138c2 100644
--- a/drivers/mfd/twl4030-audio.c
+++ b/drivers/mfd/twl4030-audio.c
@@ -118,7 +118,7 @@ EXPORT_SYMBOL_GPL(twl4030_audio_enable_resource);
* Disable the resource.
* The function returns with error or the content of the register
*/
-int twl4030_audio_disable_resource(unsigned id)
+int twl4030_audio_disable_resource(enum twl4030_audio_res id)
{
struct twl4030_audio *audio = platform_get_drvdata(twl4030_audio_dev);
int val;