Removal of duplicate cbus entry
PATCH 1/1 Removal of duplicate cbus entry
Removal of duplicate cbus entry.
--- drivers/Makefile | 1 - 1 files changed, 0 insertions(+), 1 deletions(-)
drivers/Makefile +0 -1
@@ -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/ obj-$(CONFIG_ATM) += atm/ obj-y += macintosh/
Quoted 14 lines · On Thu, 12 Feb 2009 16:39:53 +0100 "Palande Ameya (Nokia-D/Helsinki)"…
Removal of duplicate cbus entry.
Signed-off-by Ameya Palande <[email protected]>--- drivers/Makefile | 1 - 1 files changed, 0 insertions(+), 1 deletions(-)drivers/Makefile +0
-0@@ -41,7 +41,6 @@ obj-y += serial/ obj-$(CONFIG_PARPORT) += parport/ obj-y += base/ block/ misc/ mfd/ net/
Quoted 3 lines
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
PATCH 1/1 ARM: OMAP: Removal of duplicate cbus entry
--- drivers/Makefile | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
drivers/Makefile +1 -1
@@ -39,7 +39,7 @@ obj-$(CONFIG_FB_INTEL) += video/intelfb/ obj-$(CONFIG_SERIO) += input/serio/ obj-y += serial/ obj-$(CONFIG_PARPORT) += parport/ -obj-y += base/ block/ misc/ mfd/ net/ media/ cbus/ +obj-y += base/ block/ misc/ mfd/ net/ media/ obj-y += i2c/ obj-y += cbus/ obj-$(CONFIG_NUBUS) += nubus/
Signature · 1 line
1.5.6.3
Re: [PATCH] ARM: OMAP: Removal of duplicate cbus entry
Quoted 10 lines · Ameya Palande
Signed-off-by Ameya Palande <[email protected]>--- drivers/Makefile | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)drivers/Makefile +0
-0
drivers/Makefile obj-$(CONFIG_FB_INTEL) += video/intelfb/ · line 45
Quoted 8 lines
drivers/Makefile +1
-1@@ -39,7 +39,7 @@ obj-$(CONFIG_FB_INTEL) += video/intelfb/ obj-$(CONFIG_SERIO) += input/serio/ obj-y += serial/ obj-$(CONFIG_PARPORT) += parport/ -obj-y += base/ block/ misc/ mfd/ net/ media/ cbus/ +obj-y += base/ block/ misc/ mfd/ net/ media/ obj-y += i2c/ obj-y += cbus/ obj-$(CONFIG_NUBUS) += nubus/
Thanks, pushing today.
Tony