Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 44779149 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge master.kernel.org:/pub/scm/linux/kernel/git/bart/ide-2.6

parents 8ee3f402 17514e8a

drivers/ide/ide-cd.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -3511,7 +3511,7 @@ static void __exit ide_cdrom_exit(void) 
	driver_unregister(&ide_cdrom_driver.gen_driver);

	driver_unregister(&ide_cdrom_driver.gen_driver);

}

}





static int ide_cdrom_init(void)

static int __init ide_cdrom_init(void)

{

{

	return driver_register(&ide_cdrom_driver.gen_driver);

	return driver_register(&ide_cdrom_driver.gen_driver);

}

}

drivers/ide/ide-disk.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -1266,7 +1266,7 @@ static void __exit idedisk_exit (void) 
	driver_unregister(&idedisk_driver.gen_driver);

	driver_unregister(&idedisk_driver.gen_driver);

}

}





static int idedisk_init (void)

static int __init idedisk_init(void)

{

{

	return driver_register(&idedisk_driver.gen_driver);

	return driver_register(&idedisk_driver.gen_driver);

}

}

drivers/ide/ide-floppy.c

+1 −4
Original line number Original line Diff line number Diff line
@@ -2191,10 +2191,7 @@ static void __exit idefloppy_exit (void) 
	driver_unregister(&idefloppy_driver.gen_driver);

	driver_unregister(&idefloppy_driver.gen_driver);

}

}





/*

static int __init idefloppy_init(void)

 *	idefloppy_init will register the driver for each floppy.

 */

static int idefloppy_init (void)

{

{

	printk("ide-floppy driver " IDEFLOPPY_VERSION "\n");

	printk("ide-floppy driver " IDEFLOPPY_VERSION "\n");

	return driver_register(&idefloppy_driver.gen_driver);

	return driver_register(&idefloppy_driver.gen_driver);

drivers/ide/ide-io.c

+0 −6
Original line number Original line Diff line number Diff line
@@ -1629,12 +1629,6 @@ EXPORT_SYMBOL(ide_init_drive_cmd); 
 *	for the new rq to be completed.  This is VERY DANGEROUS, and is

 *	for the new rq to be completed.  This is VERY DANGEROUS, and is

 *	intended for careful use by the ATAPI tape/cdrom driver code.

 *	intended for careful use by the ATAPI tape/cdrom driver code.

 *

 *

 *	If action is ide_next, then the rq is queued immediately after

 *	the currently-being-processed-request (if any), and the function

 *	returns without waiting for the new rq to be completed.  As above,

 *	This is VERY DANGEROUS, and is intended for careful use by the

 *	ATAPI tape/cdrom driver code.

 *

 *	If action is ide_end, then the rq is queued at the end of the

 *	If action is ide_end, then the rq is queued at the end of the

 *	request queue, and the function returns immediately without waiting

 *	request queue, and the function returns immediately without waiting

 *	for the new rq to be completed. This is again intended for careful

 *	for the new rq to be completed. This is again intended for careful

drivers/ide/ide-tape.c

+1 −4
Original line number Original line Diff line number Diff line
@@ -4916,10 +4916,7 @@ static void __exit idetape_exit (void) 
	unregister_chrdev(IDETAPE_MAJOR, "ht");

	unregister_chrdev(IDETAPE_MAJOR, "ht");

}

}





/*

static int __init idetape_init(void)

 *	idetape_init will register the driver for each tape.

 */

static int idetape_init (void)

{

{

	int error = 1;

	int error = 1;

	idetape_sysfs_class = class_create(THIS_MODULE, "ide_tape");

	idetape_sysfs_class = class_create(THIS_MODULE, "ide_tape");