diff options
| author | Linus Torvalds <torvalds@home.transmeta.com> | 2002-10-31 06:55:43 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@home.transmeta.com> | 2002-10-31 06:55:43 -0800 |
| commit | 2b738648aa4bd9d99f52e01120421feef6b16eb1 (patch) | |
| tree | c8c2ead9e22421dc5fee35a0e429de67ff4e46fd /init | |
| parent | 4b283d5958d517db133e0b4dc5b8ce323a36c0ad (diff) | |
| parent | 715814fdc3390e9470f6eecfc0623c1097cc5664 (diff) | |
Merge bk://linux-bt.bkbits.net/bt-2.5
into home.transmeta.com:/home/torvalds/v2.5/linux
Diffstat (limited to 'init')
| -rw-r--r-- | init/do_mounts.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/init/do_mounts.c b/init/do_mounts.c index 2a8fb51550ca..040e8671d449 100644 --- a/init/do_mounts.c +++ b/init/do_mounts.c @@ -101,7 +101,7 @@ static __init dev_t try_name(char *name, int part) /* read device number from .../dev */ - sprintf(path, "/sys/bus/block/devices/%s/dev", name); + sprintf(path, "/sys/block/%s/dev", name); fd = open(path, 0, 0); if (fd < 0) goto fail; @@ -119,7 +119,7 @@ static __init dev_t try_name(char *name, int part) return res; /* otherwise read range from .../range */ - sprintf(path, "/sys/bus/block/devices/%s/range", name); + sprintf(path, "/sys/block/%s/range", name); fd = open(path, 0, 0); if (fd < 0) goto fail; @@ -166,7 +166,7 @@ __init dev_t name_to_dev_t(char *name) int part; sys_mkdir("/sys", 0700); - if (sys_mount("driverfs", "/sys", "driverfs", 0, NULL) < 0) + if (sys_mount("sysfs", "/sys", "sysfs", 0, NULL) < 0) goto out; if (strncmp(name, "/dev/", 5) != 0) { |