diff options
| author | Linus Torvalds <torvalds@athlon.transmeta.com> | 2002-02-04 20:32:43 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@athlon.transmeta.com> | 2002-02-04 20:32:43 -0800 |
| commit | a8a2069f432c5597bdf9c83ab3045b9ef32ab5e3 (patch) | |
| tree | 06d1047415e70b9a6cbd0567ae1202433530dd46 /init | |
| parent | 5db5272c0a5cd37e5a697e4750fbc4ce6317b7dc (diff) | |
v2.4.14.1 -> v2.4.14.2
- Ivan Kokshaysky: fix alpha dec_and_lock with modules, for alpha config entry
- Kai Germaschewski: ISDN updates
- Jeff Garzik: network driver updates, sysv fs update
- Kai Mäkisara: SCSI tape update
- Alan Cox: large drivers merge
- Nikita Danilov: reiserfs procfs information
- Andrew Morton: ext3 merge
- Christoph Hellwig: vxfs livelock fix
- Trond Myklebust: NFS updates
- Jens Axboe: cpqarray + cciss dequeue fix
- Tim Waugh: parport_serial base_baud setting
- Matthew Dharm: usb-storage Freecom driver fixes
- Dave McCracken: wait4() thread group race fix
Diffstat (limited to 'init')
| -rw-r--r-- | init/main.c | 2 | ||||
| -rw-r--r-- | init/version.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/init/main.c b/init/main.c index c8a1b7342761..f0231bc9eccc 100644 --- a/init/main.c +++ b/init/main.c @@ -119,7 +119,7 @@ extern void softirq_init(void); int rows, cols; #ifdef CONFIG_BLK_DEV_INITRD -kdev_t real_root_dev; +unsigned int real_root_dev; /* do_proc_dointvec cannot handle kdev_t */ #endif int root_mountflags = MS_RDONLY; diff --git a/init/version.c b/init/version.c index 2ec3dee252ed..95add712b5b3 100644 --- a/init/version.c +++ b/init/version.c @@ -1,5 +1,5 @@ /* - * linux/version.c + * linux/init/version.c * * Copyright (C) 1992 Theodore Ts'o * |