Merge branch 'master' of /home/trondmy/kernel/linux-2.6/

1 files changed, 0 insertions, 3 deletions

diff --git a/drivers/ide/ide-disk.c b/drivers/ide/ide-disk.c
index f033d732f387..f712e4cfd9dc 100644
--- a/drivers/ide/ide-disk.c
+++ b/drivers/ide/ide-disk.c
@@ -47,7 +47,6 @@
 
 //#define DEBUG
 
-#include <linux/config.h>
 #include <linux/module.h>
 #include <linux/types.h>
 #include <linux/string.h>
@@ -1018,7 +1017,6 @@ static void ide_disk_release(struct kref *kref)
         struct gendisk *g = idkp->disk;
 
         drive->driver_data = NULL;
-        drive->devfs_name[0] = '\0';
         g->private_data = NULL;
         put_disk(g);
         kfree(idkp);
@@ -1222,7 +1220,6 @@ static int ide_disk_probe(ide_drive_t *drive)
                 drive->attach = 1;
 
         g->minors = 1 << PARTN_BITS;
-        strcpy(g->devfs_name, drive->devfs_name);
         g->driverfs_dev = &drive->gendev;
         g->flags = drive->removable ? GENHD_FL_REMOVABLE : 0;
         set_capacity(g, idedisk_capacity(drive));