* [PATCH] Removal of duplicate cbus entry
@ 2009-02-12 15:39 Ameya Palande
2009-02-13 7:23 ` Jarkko Nikula
0 siblings, 1 reply; 4+ messages in thread
From: Ameya Palande @ 2009-02-12 15:39 UTC (permalink / raw)
To: linux-omap
Removal of duplicate cbus entry.
Signed-off-by: Ameya Palande <ameya.palande@nokia.com>
---
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/
obj-$(CONFIG_ATM) += atm/
obj-y += macintosh/
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH] Removal of duplicate cbus entry
2009-02-12 15:39 [PATCH] Removal of duplicate cbus entry Ameya Palande
@ 2009-02-13 7:23 ` Jarkko Nikula
2009-02-13 14:00 ` [PATCH] ARM: OMAP: " Ameya Palande
0 siblings, 1 reply; 4+ messages in thread
From: Jarkko Nikula @ 2009-02-13 7:23 UTC (permalink / raw)
To: Palande Ameya (Nokia-D/Helsinki); +Cc: linux-omap@vger.kernel.org
On Thu, 12 Feb 2009 16:39:53 +0100
"Palande Ameya (Nokia-D/Helsinki)" <ameya.palande@nokia.com> wrote:
> Removal of duplicate cbus entry.
>
> Signed-off-by: Ameya Palande <ameya.palande@nokia.com>
> ---
> 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
^ permalink raw reply [flat|nested] 4+ messages in thread
* [PATCH] ARM: OMAP: Removal of duplicate cbus entry
2009-02-13 7:23 ` Jarkko Nikula
@ 2009-02-13 14:00 ` Ameya Palande
2009-02-13 22:24 ` Tony Lindgren
0 siblings, 1 reply; 4+ messages in thread
From: Ameya Palande @ 2009-02-13 14:00 UTC (permalink / raw)
To: Nikula Jarkko (Nokia-D/Helsinki); +Cc: linux-omap@vger.kernel.org
Signed-off-by: Ameya Palande <ameya.palande@nokia.com>
---
drivers/Makefile | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/drivers/Makefile b/drivers/Makefile
index 67de08b..fec4d8e 100644
--- a/drivers/Makefile
+++ b/drivers/Makefile
@@ -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/
--
1.5.6.3
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH] ARM: OMAP: Removal of duplicate cbus entry
2009-02-13 14:00 ` [PATCH] ARM: OMAP: " Ameya Palande
@ 2009-02-13 22:24 ` Tony Lindgren
0 siblings, 0 replies; 4+ messages in thread
From: Tony Lindgren @ 2009-02-13 22:24 UTC (permalink / raw)
To: Ameya Palande
Cc: Nikula Jarkko (Nokia-D/Helsinki), linux-omap@vger.kernel.org
* Ameya Palande <ameya.palande@nokia.com> [090213 06:00]:
> Signed-off-by: Ameya Palande <ameya.palande@nokia.com>
> ---
> drivers/Makefile | 2 +-
> 1 files changed, 1 insertions(+), 1 deletions(-)
>
> diff --git a/drivers/Makefile b/drivers/Makefile
> index 67de08b..fec4d8e 100644
> --- a/drivers/Makefile
> +++ b/drivers/Makefile
> @@ -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
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2009-02-13 22:24 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2009-02-12 15:39 [PATCH] Removal of duplicate cbus entry Ameya Palande
2009-02-13 7:23 ` Jarkko Nikula
2009-02-13 14:00 ` [PATCH] ARM: OMAP: " Ameya Palande
2009-02-13 22:24 ` Tony Lindgren
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox