diff --git a/[refs] b/[refs] index c747721498ee..21f0e35f99f7 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e0d44e8ab06885a5bb980f3d6d4cf64ad430d406 +refs/heads/master: a95e1f5dbca385908aa4087bb98470b0e0ac58d8 diff --git a/trunk/include/linux/devfreq.h b/trunk/include/linux/devfreq.h index 98ce8124b1cc..f7eb7d06df7e 100644 --- a/trunk/include/linux/devfreq.h +++ b/trunk/include/linux/devfreq.h @@ -200,12 +200,12 @@ struct devfreq_simple_ondemand_data { static struct devfreq *devfreq_add_device(struct device *dev, struct devfreq_dev_profile *profile, struct devfreq_governor *governor, - void *data); + void *data) { return NULL; } -static int devfreq_remove_device(struct devfreq *devfreq); +static int devfreq_remove_device(struct devfreq *devfreq) { return 0; }