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

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

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

parents bcb6ad1f 6593178d

drivers/ide/ide-cd.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -3328,8 +3328,8 @@ static ide_proc_entry_t idecd_proc[] = { 
#endif

#endif





static ide_driver_t ide_cdrom_driver = {

static ide_driver_t ide_cdrom_driver = {

	.owner			= THIS_MODULE,

	.gen_driver = {

	.gen_driver = {

		.owner		= THIS_MODULE,

		.name		= "ide-cdrom",

		.name		= "ide-cdrom",

		.bus		= &ide_bus_type,

		.bus		= &ide_bus_type,

		.probe		= ide_cd_probe,

		.probe		= ide_cd_probe,

drivers/ide/ide-disk.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -1089,8 +1089,8 @@ static void ide_device_shutdown(struct device *dev) 
}

}





static ide_driver_t idedisk_driver = {

static ide_driver_t idedisk_driver = {

	.owner			= THIS_MODULE,

	.gen_driver = {

	.gen_driver = {

		.owner		= THIS_MODULE,

		.name		= "ide-disk",

		.name		= "ide-disk",

		.bus		= &ide_bus_type,

		.bus		= &ide_bus_type,

		.probe		= ide_disk_probe,

		.probe		= ide_disk_probe,

drivers/ide/ide-floppy.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -1925,8 +1925,8 @@ static ide_proc_entry_t idefloppy_proc[] = { 
static int ide_floppy_probe(struct device *);

static int ide_floppy_probe(struct device *);





static ide_driver_t idefloppy_driver = {

static ide_driver_t idefloppy_driver = {

	.owner			= THIS_MODULE,

	.gen_driver = {

	.gen_driver = {

		.owner		= THIS_MODULE,

		.name		= "ide-floppy",

		.name		= "ide-floppy",

		.bus		= &ide_bus_type,

		.bus		= &ide_bus_type,

		.probe		= ide_floppy_probe,

		.probe		= ide_floppy_probe,

drivers/ide/ide-lib.c

+4 −4
Original line number Original line Diff line number Diff line
@@ -410,10 +410,10 @@ void ide_toggle_bounce(ide_drive_t *drive, int on) 
{

{

	u64 addr = BLK_BOUNCE_HIGH;	/* dma64_addr_t */

	u64 addr = BLK_BOUNCE_HIGH;	/* dma64_addr_t */





	if (on && drive->media == ide_disk) {

	if (!PCI_DMA_BUS_IS_PHYS) {

		if (!PCI_DMA_BUS_IS_PHYS)

		addr = BLK_BOUNCE_ANY;

		addr = BLK_BOUNCE_ANY;

		else if (HWIF(drive)->pci_dev)

	} else if (on && drive->media == ide_disk) {

		if (HWIF(drive)->pci_dev)

			addr = HWIF(drive)->pci_dev->dma_mask;

			addr = HWIF(drive)->pci_dev->dma_mask;

	}

	}

drivers/ide/ide-tape.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -4748,8 +4748,8 @@ static ide_proc_entry_t idetape_proc[] = { 
static int ide_tape_probe(struct device *);

static int ide_tape_probe(struct device *);





static ide_driver_t idetape_driver = {

static ide_driver_t idetape_driver = {

	.owner			= THIS_MODULE,

	.gen_driver = {

	.gen_driver = {

		.owner		= THIS_MODULE,

		.name		= "ide-tape",

		.name		= "ide-tape",

		.bus		= &ide_bus_type,

		.bus		= &ide_bus_type,

		.probe		= ide_tape_probe,

		.probe		= ide_tape_probe,