diff options
| author | David S. Miller <davem@davemloft.net> | 2010-12-27 01:37:05 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-12-27 01:37:05 -0500 |
| commit | 17f7f4d9fcce8f1b75b5f735569309dee7665968 (patch) | |
| tree | 14d7e49ca0053a0fcab3c33b5023bf3f90c5c08a /drivers/acpi/debugfs.c | |
| parent | 041110a439e21cd40709ead4ffbfa8034619ad77 (diff) | |
| parent | d7c1255a3a21e98bdc64df8ccf005a174d7e6289 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
net/ipv4/fib_frontend.c
Diffstat (limited to 'drivers/acpi/debugfs.c')
| -rw-r--r-- | drivers/acpi/debugfs.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/acpi/debugfs.c b/drivers/acpi/debugfs.c index 6355b575ee5a..5df67f1d6c61 100644 --- a/drivers/acpi/debugfs.c +++ b/drivers/acpi/debugfs.c | |||
| @@ -80,7 +80,7 @@ int __init acpi_debugfs_init(void) | |||
| 80 | if (!acpi_dir) | 80 | if (!acpi_dir) |
| 81 | goto err; | 81 | goto err; |
| 82 | 82 | ||
| 83 | cm_dentry = debugfs_create_file("custom_method", S_IWUGO, | 83 | cm_dentry = debugfs_create_file("custom_method", S_IWUSR, |
| 84 | acpi_dir, NULL, &cm_fops); | 84 | acpi_dir, NULL, &cm_fops); |
| 85 | if (!cm_dentry) | 85 | if (!cm_dentry) |
| 86 | goto err; | 86 | goto err; |