diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2008-10-14 20:31:54 -0400 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2008-10-14 20:31:54 -0400 |
| commit | 6dc6472581f693b5fc95aebedf67b4960fb85cf0 (patch) | |
| tree | 06a5a9a08519950575505273eabced331ed51405 /arch/powerpc/platforms/cell/spufs | |
| parent | ee673eaa72d8d185012b1027a05e25aba18c267f (diff) | |
| parent | 8acd3a60bcca17c6d89c73cee3ad6057eb83ba1e (diff) | |
Merge commit 'origin'
Manual fixup of conflicts on:
arch/powerpc/include/asm/dcr-regs.h
drivers/net/ibm_newemac/core.h
Diffstat (limited to 'arch/powerpc/platforms/cell/spufs')
| -rw-r--r-- | arch/powerpc/platforms/cell/spufs/inode.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/platforms/cell/spufs/inode.c b/arch/powerpc/platforms/cell/spufs/inode.c index 6b7c7b132454..cb85d237e492 100644 --- a/arch/powerpc/platforms/cell/spufs/inode.c +++ b/arch/powerpc/platforms/cell/spufs/inode.c | |||
| @@ -661,7 +661,7 @@ enum { | |||
| 661 | Opt_uid, Opt_gid, Opt_mode, Opt_debug, Opt_err, | 661 | Opt_uid, Opt_gid, Opt_mode, Opt_debug, Opt_err, |
| 662 | }; | 662 | }; |
| 663 | 663 | ||
| 664 | static match_table_t spufs_tokens = { | 664 | static const match_table_t spufs_tokens = { |
| 665 | { Opt_uid, "uid=%d" }, | 665 | { Opt_uid, "uid=%d" }, |
| 666 | { Opt_gid, "gid=%d" }, | 666 | { Opt_gid, "gid=%d" }, |
| 667 | { Opt_mode, "mode=%o" }, | 667 | { Opt_mode, "mode=%o" }, |