linux-next: manual merge of the pcmcia tree with the mtd tree
in [Kernel]
|
Prev: linux-next: build warning after merge of the mtd tree
Next: [PATCH 4/4 ] SCSI: Remove the AER section in kconfig file
From: Stephen Rothwell on 16 May 2010 23:30 Hi Dominik, Today's linux-next merge of the pcmcia tree got a conflict in drivers/mtd/maps/pcmciamtd.c between commit 9bdde162ebcc0237e722e8c3d0d376e35188a98f ("pcmciamtd: coding style cleanups") from the mtd tree and commit 317b6d63000b3cc48c43d582d76063500e531a6c ("pcmcia: dev_node removal (write-only drivers)") from the pcmcia tree. I fixed it up (see below) and can carry the fix as necessary. -- Cheers, Stephen Rothwell sfr(a)canb.auug.org.au diff --cc drivers/mtd/maps/pcmciamtd.c index c4aacbf,87b2b8f..0000000 --- a/drivers/mtd/maps/pcmciamtd.c +++ b/drivers/mtd/maps/pcmciamtd.c @@@ -656,12 -646,11 +655,10 @@@ static int pcmciamtd_config(struct pcmc pcmciamtd_release(link); return -ENODEV; } - snprintf(dev->node.dev_name, sizeof(dev->node.dev_name), "mtd%d", mtd->index); - info("mtd%d: %s", mtd->index, mtd->name); + dev_info(&dev->p_dev->dev, "mtd%d: %s\n", mtd->index, mtd->name); - link->dev_node = &dev->node; return 0; - failed: - err("CS Error, exiting"); + dev_err(&dev->p_dev->dev, "CS Error, exiting\n"); pcmciamtd_release(link); return -ENODEV; } -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo(a)vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/ |