Merge tag 'sound-3.4' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound

[firefly-linux-kernel-4.4.55.git] / drivers / acpi / battery.c

diff --git a/drivers/acpi/battery.c b/drivers/acpi/battery.c
index 7711d94a04091442fcf7bf261c09d7db93186ebc..86933ca8b4724372505530de753332907f488ebe 100644 (file)
--- a/drivers/acpi/battery.c
+++ b/drivers/acpi/battery.c
@@ -873,7 +873,7 @@ DECLARE_FILE_FUNCTIONS(alarm);
 
 static const struct battery_file {
        struct file_operations ops;
-       mode_t mode;
+       umode_t mode;
        const char *name;
 } acpi_battery_file[] = {
        FILE_DESCRIPTION_RO(info),