Messages in this thread Patch in this message | | | Date | Mon, 25 Jul 2005 04:58:33 +0200 | From | Pavel Machek <> | Subject | Re: [patch] fix compilation in collie.c |
| |
This fixes wrong number of arguments in call to write_scoop_reg and John's email. Please apply, Pavel
Signed-off-by: Pavel Machek <pavel@suse.cz>
diff --git a/arch/arm/mach-sa1100/collie.c b/arch/arm/mach-sa1100/collie.c --- a/arch/arm/mach-sa1100/collie.c +++ b/arch/arm/mach-sa1100/collie.c @@ -11,7 +11,7 @@ * published by the Free Software Foundation. * * ChangeLog: - * 03-06-2004 John Lenz <jelenz@wisc.edu> + * 03-06-2004 John Lenz <lenz@cs.wisc.edu> * 06-04-2002 Chris Larson <kergoth@digitalnemesis.net> * 04-16-2001 Lineo Japan,Inc. ... */ @@ -111,16 +180,18 @@ static struct mtd_partition collie_parti static void collie_set_vpp(int vpp) { - write_scoop_reg(SCOOP_GPCR, read_scoop_reg(SCOOP_GPCR) | COLLIE_SCP_VPEN); + struct device *dev = &colliescoop_device.dev; + + write_scoop_reg(dev, SCOOP_GPCR, read_scoop_reg(dev, SCOOP_GPCR) | COLLIE_SCP_VPEN); if (vpp) { - write_scoop_reg(SCOOP_GPWR, read_scoop_reg(SCOOP_GPWR) | COLLIE_SCP_VPEN); + write_scoop_reg(dev, SCOOP_GPWR, read_scoop_reg(dev, SCOOP_GPWR) | COLLIE_SCP_VPEN); } else { - write_scoop_reg(SCOOP_GPWR, read_scoop_reg(SCOOP_GPWR) & ~COLLIE_SCP_VPEN); + write_scoop_reg(dev, SCOOP_GPWR, read_scoop_reg(dev, SCOOP_GPWR) & ~COLLIE_SCP_VPEN); } } static struct flash_platform_data collie_flash_data = { .map_name = "cfi_probe", .set_vpp = collie_set_vpp, .parts = collie_partitions, .nr_parts = ARRAY_SIZE(collie_partitions), -- teflon -- maybe it is a trademark, but it should not be. - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
| |