diff options
| author | Olof Johansson <olof@lixom.net> | 2016-06-20 21:51:08 -0700 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2016-06-20 21:51:08 -0700 |
| commit | 5d82ae6ed1d127860958e6839e356cf09249cb57 (patch) | |
| tree | 208c43ee26659ccc567dff7802611c662e9ae3b8 /drivers | |
| parent | 6c8266009cfdacccc94da39493e2a88b9379b315 (diff) | |
| parent | 0a14d280e17ef3db75254439dfc83f1bc65fca6f (diff) | |
Merge tag 'vexpress-fixes-4.8' of git://git.kernel.org/pub/scm/linux/kernel/git/sudeep.holla/linux into next/cleanup
ARMv7 VExpress fixes for v4.8
Few fixes to remove build warnings with W=1
* tag 'vexpress-fixes-4.8' of git://git.kernel.org/pub/scm/linux/kernel/git/sudeep.holla/linux:
power: vexpress: make dev_attr_active static
ARM: vexpress/spc: fix missing include of spc.h
ARM: versatile: fix missing <plat/platsmp.h> include
ARM: vexpress/hotplug: fix missing core.h include
ARM: vexpress/spc: remove unused variable perf_stat_reg
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/power/reset/vexpress-poweroff.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/power/reset/vexpress-poweroff.c b/drivers/power/reset/vexpress-poweroff.c index 6a9bf7089373..102f95a09460 100644 --- a/drivers/power/reset/vexpress-poweroff.c +++ b/drivers/power/reset/vexpress-poweroff.c @@ -74,8 +74,8 @@ static ssize_t vexpress_reset_active_store(struct device *dev, return err ? err : count; } -DEVICE_ATTR(active, S_IRUGO | S_IWUSR, vexpress_reset_active_show, - vexpress_reset_active_store); +static DEVICE_ATTR(active, S_IRUGO | S_IWUSR, vexpress_reset_active_show, + vexpress_reset_active_store); enum vexpress_reset_func { FUNC_RESET, FUNC_SHUTDOWN, FUNC_REBOOT }; |