From 8154266eb282a650ef7700870a04b7e486d7e4c4 Mon Sep 17 00:00:00 2001
From: Al Viro <viro@zeniv.linux.org.uk>
Date: Sat, 23 Jul 2011 23:10:46 -0400
Subject: [PATCH] --- yaml --- r: 280217 b: refs/heads/master c:
 9104e427f3e21ddb380ddc39752624365b5bffea h: refs/heads/master i:   280215:
 d0040aa45779a64df6c603ca4823290326da0267 v: v3

---
 [refs]                                    | 2 +-
 trunk/drivers/platform/x86/intel_menlow.c | 2 +-
 trunk/include/linux/sysfs.h               | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index afeccb5d9ba4..93f5b7f5aa4e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2c9ede55ecec58099b72e4bb8eab719f32f72c31
+refs/heads/master: 9104e427f3e21ddb380ddc39752624365b5bffea
diff --git a/trunk/drivers/platform/x86/intel_menlow.c b/trunk/drivers/platform/x86/intel_menlow.c
index abddc83e9fd7..3271ac85115e 100644
--- a/trunk/drivers/platform/x86/intel_menlow.c
+++ b/trunk/drivers/platform/x86/intel_menlow.c
@@ -389,7 +389,7 @@ static ssize_t bios_enabled_show(struct device *dev,
 	return sprintf(buf, "%s\n", bios_enabled ? "enabled" : "disabled");
 }
 
-static int intel_menlow_add_one_attribute(char *name, int mode, void *show,
+static int intel_menlow_add_one_attribute(char *name, umode_t mode, void *show,
 					  void *store, struct device *dev,
 					  acpi_handle handle)
 {
diff --git a/trunk/include/linux/sysfs.h b/trunk/include/linux/sysfs.h
index dac0859e6440..d1994ec02c89 100644
--- a/trunk/include/linux/sysfs.h
+++ b/trunk/include/linux/sysfs.h
@@ -25,7 +25,7 @@ enum kobj_ns_type;
 
 struct attribute {
 	const char		*name;
-	mode_t			mode;
+	umode_t			mode;
 #ifdef CONFIG_DEBUG_LOCK_ALLOC
 	struct lock_class_key	*key;
 	struct lock_class_key	skey;