2 files changed, 2 insertions, 6 deletions

diff --git a/drivers/mmc/mmc_block.c b/drivers/mmc/mmc_block.c
index 587458b370..115cc21094 100644
--- a/drivers/mmc/mmc_block.c
+++ b/drivers/mmc/mmc_block.c
@@ -27,7 +27,6 @@
 #include <linux/hdreg.h>
 #include <linux/kdev_t.h>
 #include <linux/blkdev.h>
-#include <linux/devfs_fs_kernel.h>
 #include <linux/mutex.h>
 
 #include <linux/mmc/card.h>
@@ -409,7 +408,6 @@ static struct mmc_blk_data *mmc_blk_alloc(struct mmc_card *card)
          */
 
         sprintf(md->disk->disk_name, "mmcblk%d", devidx);
-        sprintf(md->disk->devfs_name, "mmc/blk%d", devidx);
 
         blk_queue_hardsect_size(md->queue.queue, 1 << md->block_bits);
 
@@ -555,7 +553,6 @@ static int __init mmc_blk_init(void)
         if (major == 0)
                 major = res;
 
-        devfs_mk_dir("mmc");
         return mmc_register_driver(&mmc_driver);
 
  out:
@@ -565,7 +562,6 @@ static int __init mmc_blk_init(void)
 static void __exit mmc_blk_exit(void)
 {
         mmc_unregister_driver(&mmc_driver);
-        devfs_remove("mmc");
         unregister_blkdev(major, "mmc");
 }
 
diff --git a/drivers/mmc/mmci.c b/drivers/mmc/mmci.c
index da8e4d7339..8576a65ca1 100644
--- a/drivers/mmc/mmci.c
+++ b/drivers/mmc/mmci.c
@@ -546,9 +546,9 @@ static int mmci_probe(struct amba_device *dev, void *id)
 
         mmc_add_host(mmc);
 
-        printk(KERN_INFO "%s: MMCI rev %x cfg %02x at 0x%08lx irq %d,%d\n",
+        printk(KERN_INFO "%s: MMCI rev %x cfg %02x at 0x%016llx irq %d,%d\n",
                 mmc_hostname(mmc), amba_rev(dev), amba_config(dev),
-                dev->res.start, dev->irq[0], dev->irq[1]);
+                (unsigned long long)dev->res.start, dev->irq[0], dev->irq[1]);
 
         init_timer(&host->timer);
         host->timer.data = (unsigned long)host;