diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2007-10-12 21:27:47 -0400 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2007-10-12 21:27:47 -0400 |
| commit | b981d8b3f5e008ff10d993be633ad00564fc22cd (patch) | |
| tree | e292dc07b22308912cf6a58354a608b9e5e8e1fd /fs/openpromfs | |
| parent | b11d2127c4893a7315d1e16273bc8560049fa3ca (diff) | |
| parent | 2b9e0aae1d50e880c58d46788e5e3ebd89d75d62 (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6
Conflicts:
drivers/macintosh/adbhid.c
Diffstat (limited to 'fs/openpromfs')
| -rw-r--r-- | fs/openpromfs/inode.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/openpromfs/inode.c b/fs/openpromfs/inode.c index e62397341c36..dd86be2aa6c9 100644 --- a/fs/openpromfs/inode.c +++ b/fs/openpromfs/inode.c | |||
| @@ -431,7 +431,7 @@ static int __init init_openprom_fs(void) | |||
| 431 | 0, | 431 | 0, |
| 432 | (SLAB_RECLAIM_ACCOUNT | | 432 | (SLAB_RECLAIM_ACCOUNT | |
| 433 | SLAB_MEM_SPREAD), | 433 | SLAB_MEM_SPREAD), |
| 434 | op_inode_init_once, NULL); | 434 | op_inode_init_once); |
| 435 | if (!op_inode_cachep) | 435 | if (!op_inode_cachep) |
| 436 | return -ENOMEM; | 436 | return -ENOMEM; |
| 437 | 437 | ||