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

Commit 3b44f137 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

parents b01a55a8 07203f64

drivers/ide/Kconfig

+9 −0
Original line number Diff line number Diff line
@@ -539,6 +539,15 @@ config BLK_DEV_CS5530 


	  It is safe to say Y to this question.



config BLK_DEV_CS5535

	tristate "AMD CS5535 chipset support"

	depends on X86 && !X86_64

	help

	  Include support for UDMA on the NSC/AMD CS5535 companion chipset.

	  This will automatically be detected and configured if found.



	  It is safe to say Y to this question.



config BLK_DEV_HPT34X

	tristate "HPT34X chipset support"

	help

drivers/ide/ide-floppy.c

+2 −4
Original line number Diff line number Diff line
@@ -2038,11 +2038,9 @@ static int idefloppy_ioctl(struct inode *inode, struct file *file, 
	struct ide_floppy_obj *floppy = ide_floppy_g(bdev->bd_disk);

	ide_drive_t *drive = floppy->drive;

	void __user *argp = (void __user *)arg;

	int err = generic_ide_ioctl(drive, file, bdev, cmd, arg);

	int err;

	int prevent = (arg) ? 1 : 0;

	idefloppy_pc_t pc;

	if (err != -EINVAL)

		return err;



	switch (cmd) {

	case CDROMEJECT:
@@ -2094,7 +2092,7 @@ static int idefloppy_ioctl(struct inode *inode, struct file *file, 
	case IDEFLOPPY_IOCTL_FORMAT_GET_PROGRESS:

		return idefloppy_get_format_progress(drive, argp);

	}

 	return -EINVAL;

	return generic_ide_ioctl(drive, file, bdev, cmd, arg);

}



static int idefloppy_media_changed(struct gendisk *disk)

drivers/ide/ide-iops.c

+0 −6
Original line number Diff line number Diff line
@@ -104,8 +104,6 @@ void default_hwif_iops (ide_hwif_t *hwif) 
	hwif->INSL	= ide_insl;

}



EXPORT_SYMBOL(default_hwif_iops);



/*

 *	MMIO operations, typically used for SATA controllers

 */
@@ -329,8 +327,6 @@ void default_hwif_transport(ide_hwif_t *hwif) 
	hwif->atapi_output_bytes	= atapi_output_bytes;

}



EXPORT_SYMBOL(default_hwif_transport);



/*

 * Beginning of Taskfile OPCODE Library and feature sets.

 */
@@ -529,8 +525,6 @@ int wait_for_ready (ide_drive_t *drive, int timeout) 
	return 0;

}



EXPORT_SYMBOL(wait_for_ready);



/*

 * This routine busy-waits for the drive status to be not "busy".

 * It then checks the status for all of the "good" bits and none

drivers/ide/ide-taskfile.c

+0 −2
Original line number Diff line number Diff line
@@ -161,8 +161,6 @@ ide_startstop_t do_rw_taskfile (ide_drive_t *drive, ide_task_t *task) 
	return ide_stopped;

}



EXPORT_SYMBOL(do_rw_taskfile);



/*

 * set_multmode_intr() is invoked on completion of a WIN_SETMULT cmd.

 */

drivers/ide/ide.c

+1 −0
Original line number Diff line number Diff line
@@ -803,6 +803,7 @@ int ide_register_hw_with_fixup(hw_regs_t *hw, ide_hwif_t **hwifp, void(*fixup)(i 
	hwif->irq = hw->irq;

	hwif->noprobe = 0;

	hwif->chipset = hw->chipset;

	hwif->gendev.parent = hw->dev;



	if (!initializing) {

		probe_hwif_init_with_fixup(hwif, fixup);