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

Commit 597049cc authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

* master.kernel.org:/pub/scm/linux/kernel/git/bart/ide-2.6:
  via82cxxx/pata_via: correct PCI_DEVICE_ID_VIA_SATA_EIDE ID and add support for CX700 and 8237S
  ide: unregister idepnp driver on unload
  ide: add missing __init tags to IDE PCI host drivers
  ia64: add pci_get_legacy_ide_irq()
  ide/generic: Jmicron has its own drivers now
  atiixp.c: add cable detection support for ATI IDE
  atiixp.c: sb600 ide only has one channel
  atiixp.c: remove unused code
  jmicron: fix warning
  ide: update MAINTAINERS entry
parents d3143e71 e0b874df

MAINTAINERS

+3 −4
Original line number Diff line number Diff line
@@ -1598,12 +1598,11 @@ M: ipslinux@adaptec.com 
W:	http://www.developer.ibm.com/welcome/netfinity/serveraid.html

S:	Supported 



IDE DRIVER [GENERAL]

IDE SUBSYSTEM

P:	Bartlomiej Zolnierkiewicz

M:	B.Zolnierkiewicz@elka.pw.edu.pl

L:	linux-kernel@vger.kernel.org

M:	bzolnier@gmail.com

L:	linux-ide@vger.kernel.org

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

T:	quilt kernel.org/pub/linux/kernel/people/bart/pata-2.6/

S:	Maintained



IDE/ATAPI CDROM DRIVER

drivers/ata/pata_via.c

+1 −0
Original line number Diff line number Diff line
@@ -95,6 +95,7 @@ static const struct via_isa_bridge { 
	u8 rev_max;

	u16 flags;

} via_isa_bridges[] = {

	{ "vt8237s",	PCI_DEVICE_ID_VIA_8237S,    0x00, 0x2f, VIA_UDMA_133 | VIA_BAD_AST },

	{ "vt8251",	PCI_DEVICE_ID_VIA_8251,     0x00, 0x2f, VIA_UDMA_133 | VIA_BAD_AST },

	{ "cx700",	PCI_DEVICE_ID_VIA_CX700,    0x00, 0x2f, VIA_UDMA_133 | VIA_BAD_AST },

	{ "vt6410",	PCI_DEVICE_ID_VIA_6410,     0x00, 0x2f, VIA_UDMA_133 | VIA_BAD_AST | VIA_NO_ENABLES},

drivers/ide/ide-pnp.c

+5 −0
Original line number Diff line number Diff line
@@ -73,3 +73,8 @@ void __init pnpide_init(void) 
{

	pnp_register_driver(&idepnp_driver);

}



void __exit pnpide_exit(void)

{

	pnp_unregister_driver(&idepnp_driver);

}

drivers/ide/ide.c

+5 −0
Original line number Diff line number Diff line
@@ -1782,6 +1782,7 @@ static int __init ide_setup(char *s) 
}



extern void pnpide_init(void);

extern void pnpide_exit(void);

extern void h8300_ide_init(void);



/*
@@ -2094,6 +2095,10 @@ void cleanup_module (void) 
	for (index = 0; index < MAX_HWIFS; ++index)

		ide_unregister(index);



#ifdef CONFIG_BLK_DEV_IDEPNP

	pnpide_exit();

#endif



#ifdef CONFIG_PROC_FS

	proc_ide_destroy();

#endif

drivers/ide/pci/aec62xx.c

+1 −1
Original line number Diff line number Diff line
@@ -441,7 +441,7 @@ static struct pci_driver driver = { 
	.probe		= aec62xx_init_one,

};



static int aec62xx_ide_init(void)

static int __init aec62xx_ide_init(void)

{

	return ide_pci_register_driver(&driver);

}