From c05b876d772da018785a1b394ab29edefcdb4e24 Mon Sep 17 00:00:00 2001 From: Bartlomiej Zolnierkiewicz Date: Wed, 16 Jul 2008 20:33:42 +0200 Subject: [PATCH] --- yaml --- r: 102105 b: refs/heads/master c: 9a5ae1faaaf43933dee48c223b193d5e1c4b8b0c h: refs/heads/master i: 102103: 5530f670c9662b18d33ffd475000ef4dd3c52f54 v: v3 --- [refs] | 2 +- trunk/drivers/ide/arm/rapide.c | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 28016e01c615..d076d6a22251 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b48c89a9699f451e4e236fa7313461281c00e69b +refs/heads/master: 9a5ae1faaaf43933dee48c223b193d5e1c4b8b0c diff --git a/trunk/drivers/ide/arm/rapide.c b/trunk/drivers/ide/arm/rapide.c index 1747b2358775..bb081ad53f31 100644 --- a/trunk/drivers/ide/arm/rapide.c +++ b/trunk/drivers/ide/arm/rapide.c @@ -11,6 +11,10 @@ #include +static struct const ide_port_info rapide_port_info = { + .host_flags = IDE_HFLAG_MMIO | IDE_HFLAG_NO_DMA, +}; + static void rapide_setup_ports(hw_regs_t *hw, void __iomem *base, void __iomem *ctrl, unsigned int sz, int irq) { @@ -53,12 +57,11 @@ rapide_probe(struct expansion_card *ec, const struct ecard_id *id) ide_init_port_hw(hwif, &hw); - hwif->host_flags = IDE_HFLAG_MMIO; default_hwif_mmiops(hwif); idx[0] = hwif->index; - ide_device_add(idx, NULL); + ide_device_add(idx, &rapide_port_info); ecard_set_drvdata(ec, hwif); goto out;