projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge master.kernel.org:/pub/scm/linux/kernel/git/tmlind/linux-omap-upstream into...
[powerpc.git]
/
mm
/
tiny-shmem.c
diff --git
a/mm/tiny-shmem.c
b/mm/tiny-shmem.c
index
f9d6a9c
..
5f2cbf0
100644
(file)
--- a/
mm/tiny-shmem.c
+++ b/
mm/tiny-shmem.c
@@
-12,7
+12,6
@@
#include <linux/fs.h>
#include <linux/init.h>
#include <linux/fs.h>
#include <linux/init.h>
-#include <linux/devfs_fs_kernel.h>
#include <linux/vfs.h>
#include <linux/mount.h>
#include <linux/file.h>
#include <linux/vfs.h>
#include <linux/mount.h>
#include <linux/file.h>
@@
-33,9
+32,6
@@
static int __init init_tmpfs(void)
{
BUG_ON(register_filesystem(&tmpfs_fs_type) != 0);
{
BUG_ON(register_filesystem(&tmpfs_fs_type) != 0);
-#ifdef CONFIG_TMPFS
- devfs_mk_dir("shm");
-#endif
shm_mnt = kern_mount(&tmpfs_fs_type);
BUG_ON(IS_ERR(shm_mnt));
shm_mnt = kern_mount(&tmpfs_fs_type);
BUG_ON(IS_ERR(shm_mnt));