Signed-off-by: Andrew Morton <akpm@osdl.org>
---

 arch/um/drivers/ubd_kern.c          |    2 --
 drivers/block/acsi_slm.c            |    1 -
 drivers/block/floppy.c              |    2 --
 drivers/block/loop.c                |    2 --
 drivers/block/nbd.c                 |    1 -
 drivers/block/paride/pg.c           |    1 -
 drivers/block/paride/pt.c           |    1 -
 drivers/block/rd.c                  |    2 --
 drivers/block/swim3.c               |    2 --
 drivers/block/sx8.c                 |    2 --
 drivers/block/ub.c                  |    1 -
 drivers/cdrom/sbpcd.c               |    2 --
 drivers/char/ipmi/ipmi_devintf.c    |    2 --
 drivers/char/istallion.c            |    1 -
 drivers/char/lp.c                   |    1 -
 drivers/char/ppdev.c                |    1 -
 drivers/char/pty.c                  |    1 -
 drivers/char/stallion.c             |    1 -
 drivers/char/tipar.c                |    3 ---
 drivers/md/dm-ioctl.c               |    1 -
 drivers/md/md.c                     |    1 -
 drivers/media/dvb/dvb-core/dvbdev.c |    3 ---
 drivers/mmc/mmc_block.c             |    1 -
 drivers/net/wan/cosa.c              |    1 -
 drivers/s390/block/dasd.c           |    3 ---
 drivers/s390/block/xpram.c          |    2 --
 drivers/sbus/char/bpp.c             |    1 -
 drivers/sbus/char/vfc_dev.c         |    1 -
 drivers/video/fbmem.c               |    1 -
 fs/coda/psdev.c                     |    1 -
 include/linux/devfs_fs_kernel.h     |    4 ----
 mm/shmem.c                          |    4 +---
 mm/tiny-shmem.c                     |    3 ---
 33 files changed, 1 insertion(+), 55 deletions(-)

diff -puN arch/um/drivers/ubd_kern.c~gregkh-devfs-devfs-remove-devfs_mk_dir arch/um/drivers/ubd_kern.c
--- devel/arch/um/drivers/ubd_kern.c~gregkh-devfs-devfs-remove-devfs_mk_dir	2006-04-26 13:49:15.000000000 -0700
+++ devel-akpm/arch/um/drivers/ubd_kern.c	2006-04-26 13:49:15.000000000 -0700
@@ -841,7 +841,6 @@ int ubd_init(void)
 {
         int i;
 
-	devfs_mk_dir("ubd");
 	if (register_blkdev(MAJOR_NR, "ubd"))
 		return -1;
 
@@ -855,7 +854,6 @@ int ubd_init(void)
 		char name[sizeof("ubd_nnn\0")];
 
 		snprintf(name, sizeof(name), "ubd_%d", fake_major);
-		devfs_mk_dir(name);
 		if (register_blkdev(fake_major, "ubd"))
 			return -1;
 	}
diff -puN drivers/block/acsi_slm.c~gregkh-devfs-devfs-remove-devfs_mk_dir drivers/block/acsi_slm.c
--- devel/drivers/block/acsi_slm.c~gregkh-devfs-devfs-remove-devfs_mk_dir	2006-04-26 13:49:15.000000000 -0700
+++ devel-akpm/drivers/block/acsi_slm.c	2006-04-26 13:49:15.000000000 -0700
@@ -1005,7 +1005,6 @@ int slm_init( void )
 	BufferP = SLMBuffer;
 	SLMState = IDLE;
 	
-	devfs_mk_dir("slm");
 	for (i = 0; i < MAX_SLM; i++) {
 		devfs_mk_cdev(MKDEV(ACSI_MAJOR, i),
 				S_IFCHR|S_IRUSR|S_IWUSR, "slm/%d", i);
diff -puN drivers/block/floppy.c~gregkh-devfs-devfs-remove-devfs_mk_dir drivers/block/floppy.c
--- devel/drivers/block/floppy.c~gregkh-devfs-devfs-remove-devfs_mk_dir	2006-04-26 13:49:15.000000000 -0700
+++ devel-akpm/drivers/block/floppy.c	2006-04-26 13:49:15.000000000 -0700
@@ -4261,8 +4261,6 @@ static int __init floppy_init(void)
 		motor_off_timer[dr].function = motor_off_callback;
 	}
 
-	devfs_mk_dir("floppy");
-
 	err = register_blkdev(FLOPPY_MAJOR, "fd");
 	if (err)
 		goto out_devfs_remove;
diff -puN drivers/block/loop.c~gregkh-devfs-devfs-remove-devfs_mk_dir drivers/block/loop.c
--- devel/drivers/block/loop.c~gregkh-devfs-devfs-remove-devfs_mk_dir	2006-04-26 13:49:15.000000000 -0700
+++ devel-akpm/drivers/block/loop.c	2006-04-26 13:49:15.000000000 -0700
@@ -1277,8 +1277,6 @@ static int __init loop_init(void)
 			goto out_mem3;
 	}
 
-	devfs_mk_dir("loop");
-
 	for (i = 0; i < max_loop; i++) {
 		struct loop_device *lo = &loop_dev[i];
 		struct gendisk *disk = disks[i];
diff -puN drivers/block/nbd.c~gregkh-devfs-devfs-remove-devfs_mk_dir drivers/block/nbd.c
--- devel/drivers/block/nbd.c~gregkh-devfs-devfs-remove-devfs_mk_dir	2006-04-26 13:49:15.000000000 -0700
+++ devel-akpm/drivers/block/nbd.c	2006-04-26 13:49:15.000000000 -0700
@@ -672,7 +672,6 @@ static int __init nbd_init(void)
 	printk(KERN_INFO "nbd: registered device at major %d\n", NBD_MAJOR);
 	dprintk(DBG_INIT, "nbd: debugflags=0x%x\n", debugflags);
 
-	devfs_mk_dir("nbd");
 	for (i = 0; i < nbds_max; i++) {
 		struct gendisk *disk = nbd_dev[i].disk;
 		nbd_dev[i].file = NULL;
diff -puN drivers/block/paride/pg.c~gregkh-devfs-devfs-remove-devfs_mk_dir drivers/block/paride/pg.c
--- devel/drivers/block/paride/pg.c~gregkh-devfs-devfs-remove-devfs_mk_dir	2006-04-26 13:49:15.000000000 -0700
+++ devel-akpm/drivers/block/paride/pg.c	2006-04-26 13:49:15.000000000 -0700
@@ -674,7 +674,6 @@ static int __init pg_init(void)
 		err = PTR_ERR(pg_class);
 		goto out_chrdev;
 	}
-	devfs_mk_dir("pg");
 	for (unit = 0; unit < PG_UNITS; unit++) {
 		struct pg *dev = &devices[unit];
 		if (dev->present) {
diff -puN drivers/block/paride/pt.c~gregkh-devfs-devfs-remove-devfs_mk_dir drivers/block/paride/pt.c
--- devel/drivers/block/paride/pt.c~gregkh-devfs-devfs-remove-devfs_mk_dir	2006-04-26 13:49:15.000000000 -0700
+++ devel-akpm/drivers/block/paride/pt.c	2006-04-26 13:49:15.000000000 -0700
@@ -971,7 +971,6 @@ static int __init pt_init(void)
 		goto out_chrdev;
 	}
 
-	devfs_mk_dir("pt");
 	for (unit = 0; unit < PT_UNITS; unit++)
 		if (pt[unit].present) {
 			class_device_create(pt_class, NULL, MKDEV(major, unit),
diff -puN drivers/block/rd.c~gregkh-devfs-devfs-remove-devfs_mk_dir drivers/block/rd.c
--- devel/drivers/block/rd.c~gregkh-devfs-devfs-remove-devfs_mk_dir	2006-04-26 13:49:15.000000000 -0700
+++ devel-akpm/drivers/block/rd.c	2006-04-26 13:49:15.000000000 -0700
@@ -442,8 +442,6 @@ static int __init rd_init(void)
 		goto out;
 	}
 
-	devfs_mk_dir("rd");
-
 	for (i = 0; i < CONFIG_BLK_DEV_RAM_COUNT; i++) {
 		struct gendisk *disk = rd_disks[i];
 
diff -puN drivers/block/swim3.c~gregkh-devfs-devfs-remove-devfs_mk_dir drivers/block/swim3.c
--- devel/drivers/block/swim3.c~gregkh-devfs-devfs-remove-devfs_mk_dir	2006-04-26 13:49:15.000000000 -0700
+++ devel-akpm/drivers/block/swim3.c	2006-04-26 13:49:15.000000000 -0700
@@ -1019,8 +1019,6 @@ int swim3_init(void)
 	int err = -ENOMEM;
 	int i;
 
-	devfs_mk_dir("floppy");
-
 	swim = find_devices("floppy");
 	while (swim && (floppy_count < MAX_FLOPPIES))
 	{
diff -puN drivers/block/sx8.c~gregkh-devfs-devfs-remove-devfs_mk_dir drivers/block/sx8.c
--- devel/drivers/block/sx8.c~gregkh-devfs-devfs-remove-devfs_mk_dir	2006-04-26 13:49:15.000000000 -0700
+++ devel-akpm/drivers/block/sx8.c	2006-04-26 13:49:15.000000000 -0700
@@ -1672,8 +1672,6 @@ static int carm_init_one (struct pci_dev
 	if (host->flags & FL_DYN_MAJOR)
 		host->major = rc;
 
-	devfs_mk_dir(DRV_NAME);
-
 	rc = carm_init_disks(host);
 	if (rc)
 		goto err_out_blkdev_disks;
diff -puN drivers/block/ub.c~gregkh-devfs-devfs-remove-devfs_mk_dir drivers/block/ub.c
--- devel/drivers/block/ub.c~gregkh-devfs-devfs-remove-devfs_mk_dir	2006-04-26 13:49:15.000000000 -0700
+++ devel-akpm/drivers/block/ub.c	2006-04-26 13:49:15.000000000 -0700
@@ -2487,7 +2487,6 @@ static int __init ub_init(void)
 
 	if ((rc = register_blkdev(UB_MAJOR, DRV_NAME)) != 0)
 		goto err_regblkdev;
-	devfs_mk_dir(DEVFS_NAME);
 
 	if ((rc = usb_register(&ub_driver)) != 0)
 		goto err_register;
diff -puN drivers/cdrom/sbpcd.c~gregkh-devfs-devfs-remove-devfs_mk_dir drivers/cdrom/sbpcd.c
--- devel/drivers/cdrom/sbpcd.c~gregkh-devfs-devfs-remove-devfs_mk_dir	2006-04-26 13:49:15.000000000 -0700
+++ devel-akpm/drivers/cdrom/sbpcd.c	2006-04-26 13:49:15.000000000 -0700
@@ -5808,8 +5808,6 @@ int __init sbpcd_init(void)
 		return -ENOMEM;
 	}
 
-	devfs_mk_dir("sbp");
-
 	for (j=0;j<NR_SBPCD;j++)
 	{
 		struct cdrom_device_info * sbpcd_infop;
diff -puN drivers/char/ipmi/ipmi_devintf.c~gregkh-devfs-devfs-remove-devfs_mk_dir drivers/char/ipmi/ipmi_devintf.c
--- devel/drivers/char/ipmi/ipmi_devintf.c~gregkh-devfs-devfs-remove-devfs_mk_dir	2006-04-26 13:49:15.000000000 -0700
+++ devel-akpm/drivers/char/ipmi/ipmi_devintf.c	2006-04-26 13:49:15.000000000 -0700
@@ -872,8 +872,6 @@ static __init int init_ipmi_devintf(void
 		ipmi_major = rv;
 	}
 
-	devfs_mk_dir(DEVICE_NAME);
-
 	rv = ipmi_smi_watcher_register(&smi_watcher);
 	if (rv) {
 		unregister_chrdev(ipmi_major, DEVICE_NAME);
diff -puN drivers/char/istallion.c~gregkh-devfs-devfs-remove-devfs_mk_dir drivers/char/istallion.c
--- devel/drivers/char/istallion.c~gregkh-devfs-devfs-remove-devfs_mk_dir	2006-04-26 13:49:15.000000000 -0700
+++ devel-akpm/drivers/char/istallion.c	2006-04-26 13:49:15.000000000 -0700
@@ -5213,7 +5213,6 @@ int __init stli_init(void)
 		printk(KERN_ERR "STALLION: failed to register serial memory "
 				"device\n");
 
-	devfs_mk_dir("staliomem");
 	istallion_class = class_create(THIS_MODULE, "staliomem");
 	for (i = 0; i < 4; i++) {
 		devfs_mk_cdev(MKDEV(STL_SIOMEMMAJOR, i),
diff -puN drivers/char/lp.c~gregkh-devfs-devfs-remove-devfs_mk_dir drivers/char/lp.c
--- devel/drivers/char/lp.c~gregkh-devfs-devfs-remove-devfs_mk_dir	2006-04-26 13:49:15.000000000 -0700
+++ devel-akpm/drivers/char/lp.c	2006-04-26 13:49:15.000000000 -0700
@@ -907,7 +907,6 @@ static int __init lp_init (void)
 		return -EIO;
 	}
 
-	devfs_mk_dir("printers");
 	lp_class = class_create(THIS_MODULE, "printer");
 	if (IS_ERR(lp_class)) {
 		err = PTR_ERR(lp_class);
diff -puN drivers/char/ppdev.c~gregkh-devfs-devfs-remove-devfs_mk_dir drivers/char/ppdev.c
--- devel/drivers/char/ppdev.c~gregkh-devfs-devfs-remove-devfs_mk_dir	2006-04-26 13:49:15.000000000 -0700
+++ devel-akpm/drivers/char/ppdev.c	2006-04-26 13:49:15.000000000 -0700
@@ -782,7 +782,6 @@ static int __init ppdev_init (void)
 		err = PTR_ERR(ppdev_class);
 		goto out_chrdev;
 	}
-	devfs_mk_dir("parports");
 	for (i = 0; i < PARPORT_MAX; i++) {
 		devfs_mk_cdev(MKDEV(PP_MAJOR, i),
 				S_IFCHR | S_IRUGO | S_IWUGO, "parports/%d", i);
diff -puN drivers/char/pty.c~gregkh-devfs-devfs-remove-devfs_mk_dir drivers/char/pty.c
--- devel/drivers/char/pty.c~gregkh-devfs-devfs-remove-devfs_mk_dir	2006-04-26 13:49:15.000000000 -0700
+++ devel-akpm/drivers/char/pty.c	2006-04-26 13:49:15.000000000 -0700
@@ -351,7 +351,6 @@ static int pty_unix98_ioctl(struct tty_s
 
 static void __init unix98_pty_init(void)
 {
-	devfs_mk_dir("pts");
 	ptm_driver = alloc_tty_driver(NR_UNIX98_PTY_MAX);
 	if (!ptm_driver)
 		panic("Couldn't allocate Unix98 ptm driver");
diff -puN drivers/char/stallion.c~gregkh-devfs-devfs-remove-devfs_mk_dir drivers/char/stallion.c
--- devel/drivers/char/stallion.c~gregkh-devfs-devfs-remove-devfs_mk_dir	2006-04-26 13:49:15.000000000 -0700
+++ devel-akpm/drivers/char/stallion.c	2006-04-26 13:49:15.000000000 -0700
@@ -3069,7 +3069,6 @@ static int __init stl_init(void)
  */
 	if (register_chrdev(STL_SIOMEMMAJOR, "staliomem", &stl_fsiomem))
 		printk("STALLION: failed to register serial board device\n");
-	devfs_mk_dir("staliomem");
 
 	stallion_class = class_create(THIS_MODULE, "staliomem");
 	for (i = 0; i < 4; i++) {
diff -puN drivers/char/tipar.c~gregkh-devfs-devfs-remove-devfs_mk_dir drivers/char/tipar.c
--- devel/drivers/char/tipar.c~gregkh-devfs-devfs-remove-devfs_mk_dir	2006-04-26 13:49:15.000000000 -0700
+++ devel-akpm/drivers/char/tipar.c	2006-04-26 13:49:15.000000000 -0700
@@ -507,9 +507,6 @@ tipar_init_module(void)
 		goto out;
 	}
 
-	/* Use devfs with tree: /dev/ticables/par/[0..2] */
-	devfs_mk_dir("ticables/par");
-
 	tipar_class = class_create(THIS_MODULE, "ticables");
 	if (IS_ERR(tipar_class)) {
 		err = PTR_ERR(tipar_class);
diff -puN drivers/md/dm-ioctl.c~gregkh-devfs-devfs-remove-devfs_mk_dir drivers/md/dm-ioctl.c
--- devel/drivers/md/dm-ioctl.c~gregkh-devfs-devfs-remove-devfs_mk_dir	2006-04-26 13:49:15.000000000 -0700
+++ devel-akpm/drivers/md/dm-ioctl.c	2006-04-26 13:49:15.000000000 -0700
@@ -67,7 +67,6 @@ static int dm_hash_init(void)
 {
 	init_buckets(_name_buckets);
 	init_buckets(_uuid_buckets);
-	devfs_mk_dir(DM_DIR);
 	return 0;
 }
 
diff -puN drivers/md/md.c~gregkh-devfs-devfs-remove-devfs_mk_dir drivers/md/md.c
--- devel/drivers/md/md.c~gregkh-devfs-devfs-remove-devfs_mk_dir	2006-04-26 13:49:15.000000000 -0700
+++ devel-akpm/drivers/md/md.c	2006-04-26 13:49:15.000000000 -0700
@@ -5075,7 +5075,6 @@ static int __init md_init(void)
 		unregister_blkdev(MAJOR_NR, "md");
 		return -1;
 	}
-	devfs_mk_dir("md");
 	blk_register_region(MKDEV(MAJOR_NR, 0), MAX_MD_DEVS, THIS_MODULE,
 				md_probe, NULL, NULL);
 	blk_register_region(MKDEV(mdp_major, 0), MAX_MD_DEVS<<MdpMinorShift, THIS_MODULE,
diff -puN drivers/media/dvb/dvb-core/dvbdev.c~gregkh-devfs-devfs-remove-devfs_mk_dir drivers/media/dvb/dvb-core/dvbdev.c
--- devel/drivers/media/dvb/dvb-core/dvbdev.c~gregkh-devfs-devfs-remove-devfs_mk_dir	2006-04-26 13:49:15.000000000 -0700
+++ devel-akpm/drivers/media/dvb/dvb-core/dvbdev.c	2006-04-26 13:49:15.000000000 -0700
@@ -302,7 +302,6 @@ int dvb_register_adapter(struct dvb_adap
 
 	printk ("DVB: registering new adapter (%s).\n", name);
 
-	devfs_mk_dir("dvb/adapter%d", num);
 	adap->num = num;
 	adap->name = name;
 	adap->module = module;
@@ -410,8 +409,6 @@ static int __init init_dvbdev(void)
 		goto error;
 	}
 
-	devfs_mk_dir("dvb");
-
 	dvb_class = class_create(THIS_MODULE, "dvb");
 	if (IS_ERR(dvb_class)) {
 		retval = PTR_ERR(dvb_class);
diff -puN drivers/mmc/mmc_block.c~gregkh-devfs-devfs-remove-devfs_mk_dir drivers/mmc/mmc_block.c
--- devel/drivers/mmc/mmc_block.c~gregkh-devfs-devfs-remove-devfs_mk_dir	2006-04-26 13:49:15.000000000 -0700
+++ devel-akpm/drivers/mmc/mmc_block.c	2006-04-26 13:49:15.000000000 -0700
@@ -548,7 +548,6 @@ static int __init mmc_blk_init(void)
 	if (major == 0)
 		major = res;
 
-	devfs_mk_dir("mmc");
 	return mmc_register_driver(&mmc_driver);
 
  out:
diff -puN drivers/net/wan/cosa.c~gregkh-devfs-devfs-remove-devfs_mk_dir drivers/net/wan/cosa.c
--- devel/drivers/net/wan/cosa.c~gregkh-devfs-devfs-remove-devfs_mk_dir	2006-04-26 13:49:15.000000000 -0700
+++ devel-akpm/drivers/net/wan/cosa.c	2006-04-26 13:49:15.000000000 -0700
@@ -393,7 +393,6 @@ static int __init cosa_init(void)
 		err = -ENODEV;
 		goto out;
 	}
-	devfs_mk_dir("cosa");
 	cosa_class = class_create(THIS_MODULE, "cosa");
 	if (IS_ERR(cosa_class)) {
 		err = PTR_ERR(cosa_class);
diff -puN drivers/s390/block/dasd.c~gregkh-devfs-devfs-remove-devfs_mk_dir drivers/s390/block/dasd.c
--- devel/drivers/s390/block/dasd.c~gregkh-devfs-devfs-remove-devfs_mk_dir	2006-04-26 13:49:15.000000000 -0700
+++ devel-akpm/drivers/s390/block/dasd.c	2006-04-26 13:49:15.000000000 -0700
@@ -2106,9 +2106,6 @@ dasd_init(void)
 
 	dasd_diag_discipline_pointer = NULL;
 
-	rc = devfs_mk_dir("dasd");
-	if (rc)
-		goto failed;
 	rc = dasd_devmap_init();
 	if (rc)
 		goto failed;
diff -puN drivers/s390/block/xpram.c~gregkh-devfs-devfs-remove-devfs_mk_dir drivers/s390/block/xpram.c
--- devel/drivers/s390/block/xpram.c~gregkh-devfs-devfs-remove-devfs_mk_dir	2006-04-26 13:49:15.000000000 -0700
+++ devel-akpm/drivers/s390/block/xpram.c	2006-04-26 13:49:15.000000000 -0700
@@ -439,8 +439,6 @@ static int __init xpram_setup_blkdev(voi
 	if (rc < 0)
 		goto out;
 
-	devfs_mk_dir("slram");
-
 	/*
 	 * Assign the other needed values: make request function, sizes and
 	 * hardsect size. All the minor devices feature the same value.
diff -puN drivers/sbus/char/bpp.c~gregkh-devfs-devfs-remove-devfs_mk_dir drivers/sbus/char/bpp.c
--- devel/drivers/sbus/char/bpp.c~gregkh-devfs-devfs-remove-devfs_mk_dir	2006-04-26 13:49:15.000000000 -0700
+++ devel-akpm/drivers/sbus/char/bpp.c	2006-04-26 13:49:15.000000000 -0700
@@ -1031,7 +1031,6 @@ static int __init bpp_init(void)
 		instances[idx].opened = 0;
 		probeLptPort(idx);
 	}
-	devfs_mk_dir("bpp");
 	for (idx = 0; idx < BPP_NO; idx++) {
 		devfs_mk_cdev(MKDEV(BPP_MAJOR, idx),
 				S_IFCHR | S_IRUSR | S_IWUSR, "bpp/%d", idx);
diff -puN drivers/sbus/char/vfc_dev.c~gregkh-devfs-devfs-remove-devfs_mk_dir drivers/sbus/char/vfc_dev.c
--- devel/drivers/sbus/char/vfc_dev.c~gregkh-devfs-devfs-remove-devfs_mk_dir	2006-04-26 13:49:15.000000000 -0700
+++ devel-akpm/drivers/sbus/char/vfc_dev.c	2006-04-26 13:49:15.000000000 -0700
@@ -677,7 +677,6 @@ static int vfc_probe(void)
 		kfree(vfc_dev_lst);
 		return -EIO;
 	}
-	devfs_mk_dir("vfc");
 	instance = 0;
 	for_all_sbusdev(sdev, sbus) {
 		if (strcmp(sdev->prom_name, "vfc") == 0) {
diff -puN drivers/video/fbmem.c~gregkh-devfs-devfs-remove-devfs_mk_dir drivers/video/fbmem.c
--- devel/drivers/video/fbmem.c~gregkh-devfs-devfs-remove-devfs_mk_dir	2006-04-26 13:49:15.000000000 -0700
+++ devel-akpm/drivers/video/fbmem.c	2006-04-26 13:49:15.000000000 -0700
@@ -1429,7 +1429,6 @@ fbmem_init(void)
 {
 	create_proc_read_entry("fb", 0, NULL, fbmem_read_proc, NULL);
 
-	devfs_mk_dir("fb");
 	if (register_chrdev(FB_MAJOR,"fb",&fb_fops))
 		printk("unable to get major %d for fb devs\n", FB_MAJOR);
 
diff -puN fs/coda/psdev.c~gregkh-devfs-devfs-remove-devfs_mk_dir fs/coda/psdev.c
--- devel/fs/coda/psdev.c~gregkh-devfs-devfs-remove-devfs_mk_dir	2006-04-26 13:49:15.000000000 -0700
+++ devel-akpm/fs/coda/psdev.c	2006-04-26 13:49:15.000000000 -0700
@@ -365,7 +365,6 @@ static int init_coda_psdev(void)
 		err = PTR_ERR(coda_psdev_class);
 		goto out_chrdev;
 	}		
-	devfs_mk_dir ("coda");
 	for (i = 0; i < MAX_CODADEVS; i++) {
 		class_device_create(coda_psdev_class, NULL,
 				MKDEV(CODA_PSDEV_MAJOR,i), NULL, "cfs%d", i);
diff -puN include/linux/devfs_fs_kernel.h~gregkh-devfs-devfs-remove-devfs_mk_dir include/linux/devfs_fs_kernel.h
--- devel/include/linux/devfs_fs_kernel.h~gregkh-devfs-devfs-remove-devfs_mk_dir	2006-04-26 13:49:15.000000000 -0700
+++ devel-akpm/include/linux/devfs_fs_kernel.h	2006-04-26 13:49:15.000000000 -0700
@@ -19,10 +19,6 @@ static inline int devfs_mk_symlink(const
 {
 	return 0;
 }
-static inline int devfs_mk_dir(const char *fmt, ...)
-{
-	return 0;
-}
 static inline void devfs_remove(const char *fmt, ...)
 {
 }
diff -puN mm/shmem.c~gregkh-devfs-devfs-remove-devfs_mk_dir mm/shmem.c
--- devel/mm/shmem.c~gregkh-devfs-devfs-remove-devfs_mk_dir	2006-04-26 13:49:15.000000000 -0700
+++ devel-akpm/mm/shmem.c	2006-04-26 13:49:29.000000000 -0700
@@ -2258,9 +2258,7 @@ static int __init init_tmpfs(void)
 		printk(KERN_ERR "Could not register tmpfs\n");
 		goto out2;
 	}
-#ifdef CONFIG_TMPFS
-	devfs_mk_dir("shm");
-#endif
+
 	shm_mnt = vfs_kern_mount(&tmpfs_fs_type, MS_NOUSER,
 				tmpfs_fs_type.name, NULL);
 	if (IS_ERR(shm_mnt)) {
diff -puN mm/tiny-shmem.c~gregkh-devfs-devfs-remove-devfs_mk_dir mm/tiny-shmem.c
--- devel/mm/tiny-shmem.c~gregkh-devfs-devfs-remove-devfs_mk_dir	2006-04-26 13:49:15.000000000 -0700
+++ devel-akpm/mm/tiny-shmem.c	2006-04-26 13:49:15.000000000 -0700
@@ -33,9 +33,6 @@ static int __init init_tmpfs(void)
 {
 	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));
 
_