On Thu, 12 Feb 2009 16:39:53 +0100 "Palande Ameya (Nokia-D/Helsinki)" <ameya.palande@xxxxxxxxx> wrote: > Removal of duplicate cbus entry. > > Signed-off-by: Ameya Palande <ameya.palande@xxxxxxxxx> > --- > drivers/Makefile | 1 - > 1 files changed, 0 insertions(+), 1 deletions(-) > > diff --git a/drivers/Makefile b/drivers/Makefile > index 67de08b..1eff6ed 100644 > --- a/drivers/Makefile > +++ b/drivers/Makefile > @@ -41,7 +41,6 @@ obj-y += serial/ > obj-$(CONFIG_PARPORT) += parport/ > obj-y += base/ block/ misc/ mfd/ net/ > media/ cbus/ obj-y += i2c/ > -obj-y += cbus/ > obj-$(CONFIG_NUBUS) += nubus/ Patch is somehow malformatted. It doesn't apply because of extra space in beginning of each non-changed line. Notes: Even this is linux-omap specific only since the cbus is not in mainline, subject needs "ARM: OMAP " prefix so it's easy to see for what subsystem the patch is. For this patch subject is descriptive enough. No need for duplicated comment. Probably Tony would like that duplicated cbus is removed from the line where are those other directories and to keep cbus in it's own line for avoiding possible merge conflicts in the future? Jarkko -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
