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

Commit 28ffb5d3 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

* git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6:
  fix BLK_DEV_HD_ONLY on ARM dependencies
  ide: export ide_doubler
  palm_bk3710: add warm-plug support
  delkin_cb: add missing __init/__exit tags
  delkin_cb: add warm-plug support
  delkin_cb: use struct ide_port_info
  delkin_cb: set proper hwif->gendev.parent value
  ide: fix host drivers missing hwif->chipset initialization
  ide-generic: add missing hwif->chipset setup
  sis5513: add missing pci_enable_device() call
  MAINTAINERS: remove SIS 5513 IDE entry
  ide: remove the ide_etrax100 chipset type
parents 19f2b8df efc0fc1c

MAINTAINERS

+0 −7
Original line number Diff line number Diff line
@@ -3658,13 +3658,6 @@ M: romieu@fr.zoreil.com 
L:	netdev@vger.kernel.org

S:	Maintained



SIS 5513 IDE CONTROLLER DRIVER

P:	Lionel Bouton

M:	Lionel.Bouton@inet6.fr

W:	http://inet6.dyn.dhs.org/sponsoring/sis5513/index.html

W:	http://gyver.homeip.net/sis5513/index.html

S:	Maintained



SIS 900/7016 FAST ETHERNET DRIVER

P:	Daniele Venzano

M:	venza@brownhat.org

drivers/ide/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -1028,6 +1028,7 @@ endif 


config BLK_DEV_HD_ONLY

	bool "Old hard disk (MFM/RLL/IDE) driver"

	depends on !ARM || ARCH_RPC || ARCH_SHARK || BROKEN

	help

	  There are two drivers for MFM/RLL/IDE hard disks. Most people use

	  the newer enhanced driver, but this old one is still around for two

drivers/ide/arm/bast-ide.c

+1 −0
Original line number Diff line number Diff line
@@ -42,6 +42,7 @@ static int __init bastide_register(unsigned int base, unsigned int aux, int irq) 


	hw.io_ports.ctl_addr = aux + (6 * 0x20);

	hw.irq = irq;

	hw.chipset = ide_generic;



	hwif = ide_find_port();

	if (hwif == NULL)

drivers/ide/arm/ide_arm.c

+1 −0
Original line number Diff line number Diff line
@@ -49,6 +49,7 @@ static int __init ide_arm_init(void) 
	memset(&hw, 0, sizeof(hw));

	ide_std_init_ports(&hw, base, ctl);

	hw.irq = IDE_ARM_IRQ;

	hw.chipset = ide_generic;



	hwif = ide_find_port();

	if (hwif) {

drivers/ide/arm/palm_bk3710.c

+0 −3
Original line number Diff line number Diff line
@@ -409,9 +409,6 @@ static int __devinit palm_bk3710_probe(struct platform_device *pdev) 


	ide_device_add(idx, &palm_bk3710_port_info);



	if (!hwif->present)

		goto out;



	return 0;

out:

	printk(KERN_WARNING "Palm Chip BK3710 IDE Register Fail\n");