summaryrefslogtreecommitdiffstats
path: root/init
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2006-03-26 09:41:18 -0800
committerLinus Torvalds <torvalds@g5.osdl.org>2006-03-26 09:41:18 -0800
commit9ae21d1bb376436285cd5346d3e4b3655d6dd1b9 (patch)
tree8f889770fae721da63bd378c1834a87e2eb1cfb5 /init
parentf9b4192923fa6e38331e88214b1fe5fc21583fcc (diff)
parente9415777b1cd0eaf4d1d3d61772f0e6d5c2551ad (diff)
downloadlinux-9ae21d1bb376436285cd5346d3e4b3655d6dd1b9.tar.bz2
Merge git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial
* git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial: drivers/char/ftape/lowlevel/fdc-io.c: Correct a comment Kconfig help: MTD_JEDECPROBE already supports Intel Remove ugly debugging stuff do_mounts.c: Minor ROOT_DEV comment cleanup BUG_ON() Conversion in drivers/s390/block/dasd_devmap.c BUG_ON() Conversion in mm/mempool.c BUG_ON() Conversion in mm/memory.c BUG_ON() Conversion in kernel/fork.c BUG_ON() Conversion in ipc/sem.c BUG_ON() Conversion in fs/ext2/ BUG_ON() Conversion in fs/hfs/ BUG_ON() Conversion in fs/dcache.c BUG_ON() Conversion in fs/buffer.c BUG_ON() Conversion in input/serio/hp_sdc_mlc.c BUG_ON() Conversion in md/dm-table.c BUG_ON() Conversion in md/dm-path-selector.c BUG_ON() Conversion in drivers/isdn BUG_ON() Conversion in drivers/char BUG_ON() Conversion in drivers/mtd/
Diffstat (limited to 'init')
-rw-r--r--init/do_mounts.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/init/do_mounts.c b/init/do_mounts.c
index 8b671fe68afa..adb7cad3e6ee 100644
--- a/init/do_mounts.c
+++ b/init/do_mounts.c
@@ -23,7 +23,6 @@ int root_mountflags = MS_RDONLY | MS_SILENT;
char * __initdata root_device_name;
static char __initdata saved_root_name[64];
-/* this is initialized in init/main.c */
dev_t ROOT_DEV;
static int __init load_ramdisk(char *str)