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

Commit 700d4558 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6 

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6:
  ide_pci_generic: add quirk for Netcell ATA RAID
parents b4566ac5 c339dfdd

drivers/ide/ide-pci-generic.c

+11 −0
Original line number Original line Diff line number Diff line
@@ -33,6 +33,16 @@ static int ide_generic_all; /* Set to claim all devices */ 
module_param_named(all_generic_ide, ide_generic_all, bool, 0444);

module_param_named(all_generic_ide, ide_generic_all, bool, 0444);

MODULE_PARM_DESC(all_generic_ide, "IDE generic will claim all unknown PCI IDE storage controllers.");

MODULE_PARM_DESC(all_generic_ide, "IDE generic will claim all unknown PCI IDE storage controllers.");





static void netcell_quirkproc(ide_drive_t *drive)

{

	/* mark words 85-87 as valid */

	drive->id[ATA_ID_CSF_DEFAULT] |= 0x4000;

}



static const struct ide_port_ops netcell_port_ops = {

	.quirkproc		= netcell_quirkproc,

};



#define DECLARE_GENERIC_PCI_DEV(extra_flags) \

#define DECLARE_GENERIC_PCI_DEV(extra_flags) \

	{ \

	{ \

		.name		= DRV_NAME, \

		.name		= DRV_NAME, \
@@ -74,6 +84,7 @@ static const struct ide_port_info generic_chipsets[] __devinitdata = { 




	{	/* 6: Revolution */

	{	/* 6: Revolution */

		.name		= DRV_NAME,

		.name		= DRV_NAME,

		.port_ops	= &netcell_port_ops,

		.host_flags	= IDE_HFLAG_CLEAR_SIMPLEX |

		.host_flags	= IDE_HFLAG_CLEAR_SIMPLEX |

				  IDE_HFLAG_TRUST_BIOS_FOR_DMA |

				  IDE_HFLAG_TRUST_BIOS_FOR_DMA |

				  IDE_HFLAG_OFF_BOARD,

				  IDE_HFLAG_OFF_BOARD,