Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide (14867719) · Commits · 戴 / test

drivers/ide/Kconfig

+4 −1

Original line number	Diff line number	Diff line
		@@ -416,6 +416,7 @@ config BLK_DEV_CY82C693

		config BLK_DEV_CS5520
		tristate "Cyrix CS5510/20 MediaGX chipset support (VERY EXPERIMENTAL)"
		depends on X86_32 \|\| COMPILE_TEST
		select BLK_DEV_IDEDMA_PCI
		help
		Include support for PIO tuning and virtual DMA on the Cyrix MediaGX
		@@ -426,6 +427,7 @@ config BLK_DEV_CS5520

		config BLK_DEV_CS5530
		tristate "Cyrix/National Semiconductor CS5530 MediaGX chipset support"
		depends on X86_32 \|\| COMPILE_TEST
		select BLK_DEV_IDEDMA_PCI
		help
		Include support for UDMA on the Cyrix MediaGX 5530 chipset. This
		@@ -435,7 +437,7 @@ config BLK_DEV_CS5530

		config BLK_DEV_CS5535
		tristate "AMD CS5535 chipset support"
		depends on X86 && !X86_64
		depends on X86_32
		select BLK_DEV_IDEDMA_PCI
		help
		Include support for UDMA on the NSC/AMD CS5535 companion chipset.
		@@ -486,6 +488,7 @@ config BLK_DEV_JMICRON

		config BLK_DEV_SC1200
		tristate "National SCx200 chipset support"
		depends on X86_32 \|\| COMPILE_TEST
		select BLK_DEV_IDEDMA_PCI
		help
		This driver adds support for the on-board IDE controller on the

+5 −3

Original line number	Diff line number	Diff line
		@@ -853,6 +853,7 @@ static int init_irq (ide_hwif_t *hwif)
		if (irq_handler == NULL)
		irq_handler = ide_intr;

		if (!host->get_lock)
		if (request_irq(hwif->irq, irq_handler, sa, hwif->name, hwif))
		goto out_up;

		@@ -1533,6 +1534,7 @@ static void ide_unregister(ide_hwif_t *hwif)

		ide_proc_unregister_port(hwif);

		if (!hwif->host->get_lock)
		free_irq(hwif->irq, hwif);

		device_unregister(hwif->portdev);