Commit 2927fcea 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:
  drivers/ide/palm_bk3710.c buildfix
  ide: fix Falcon IDE breakage
  ide: fix IDE PMAC breakage
parents 36f392d0 ef183f6b

drivers/ide/falconide.c

+1 −1
Original line number Diff line number Diff line
@@ -82,7 +82,7 @@ static const struct ide_tp_ops falconide_tp_ops = { 


static const struct ide_port_info falconide_port_info = {

	.tp_ops			= &falconide_tp_ops,

	.host_flags		= IDE_HFLAG_NO_DMA,

	.host_flags		= IDE_HFLAG_NO_DMA | IDE_HFLAG_SERIALIZE,

};



static void __init falconide_setup_ports(hw_regs_t *hw)

drivers/ide/ide-probe.c

+2 −1
Original line number Diff line number Diff line
@@ -649,6 +649,7 @@ static int ide_register_port(ide_hwif_t *hwif) 
	/* register with global device tree */

	dev_set_name(&hwif->gendev, hwif->name);

	hwif->gendev.driver_data = hwif;

	if (hwif->gendev.parent == NULL)

		hwif->gendev.parent = hwif->dev;

	hwif->gendev.release = hwif_release_dev;

drivers/ide/palm_bk3710.c

+7 −4
Original line number Diff line number Diff line
@@ -346,7 +346,8 @@ static int __init palm_bk3710_probe(struct platform_device *pdev) 
{

	struct clk *clk;

	struct resource *mem, *irq;

	unsigned long base, rate;

	void __iomem *base;

	unsigned long rate;

	int i, rc;

	hw_regs_t hw, *hws[] = { &hw, NULL, NULL, NULL };
@@ -382,11 +383,13 @@ static int __init palm_bk3710_probe(struct platform_device *pdev) 
	base = IO_ADDRESS(mem->start);



	/* Configure the Palm Chip controller */

	palm_bk3710_chipinit((void __iomem *)base);

	palm_bk3710_chipinit(base);



	for (i = 0; i < IDE_NR_PORTS - 2; i++)

		hw.io_ports_array[i] = base + IDE_PALM_ATA_PRI_REG_OFFSET + i;

	hw.io_ports.ctl_addr = base + IDE_PALM_ATA_PRI_CTL_OFFSET;

		hw.io_ports_array[i] = (unsigned long)

				(base + IDE_PALM_ATA_PRI_REG_OFFSET + i);

	hw.io_ports.ctl_addr = (unsigned long)

			(base + IDE_PALM_ATA_PRI_CTL_OFFSET);

	hw.irq = irq->start;

	hw.dev = &pdev->dev;

	hw.chipset = ide_palm3710;