diff for duplicates of <20120512071727.GA2099@codeaurora.org> diff --git a/a/1.txt b/N1/1.txt index 48e80f7..214ec12 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -15,7 +15,7 @@ David > > Adds sapphire into the make file, and fixes all the code problems that > > prevented it from building (including adding board-sapphire.h) > > -> > [davidb@codeaurora.org: Move MACH_TROUT selection back under +> > [davidb at codeaurora.org: Move MACH_TROUT selection back under > > ARCH_MSM7X00A] > > > > Signed-off-by: Daniel Walker <dwalker@fifo99.com> @@ -23,12 +23,12 @@ David > > --- > > v2 - Moved MACH_TROUT selection back under the ARCH config target > > -> > arch/arm/mach-msm/Kconfig | 9 +- -> > arch/arm/mach-msm/Makefile | 1 + -> > arch/arm/mach-msm/board-sapphire.c | 18 +-- -> > arch/arm/mach-msm/board-sapphire.h | 224 ++++++++++++++++++++++++++++++++++++ -> > 4 files changed, 234 insertions(+), 18 deletions(-) -> > create mode 100644 arch/arm/mach-msm/board-sapphire.h +> > ?arch/arm/mach-msm/Kconfig ? ? ? ? ?| ? ?9 +- +> > ?arch/arm/mach-msm/Makefile ? ? ? ? | ? ?1 + +> > ?arch/arm/mach-msm/board-sapphire.c | ? 18 +-- +> > ?arch/arm/mach-msm/board-sapphire.h | ?224 ++++++++++++++++++++++++++++++++++++ +> > ?4 files changed, 234 insertions(+), 18 deletions(-) +> > ?create mode 100644 arch/arm/mach-msm/board-sapphire.h > > > > diff --git a/arch/arm/mach-msm/Kconfig b/arch/arm/mach-msm/Kconfig > > index 1cd40ad..70eae63 100644 @@ -36,10 +36,10 @@ David > > +++ b/arch/arm/mach-msm/Kconfig > > @@ -6,7 +6,7 @@ choice > > -> > config ARCH_MSM7X00A -> > bool "MSM7x00A / MSM7x01A" -> > - select MACH_TROUT if !MACH_HALIBUT -> > + select MACH_TROUT if (!MACH_HALIBUT && !MACH_SAPPHIRE) +> > ?config ARCH_MSM7X00A +> > ? ? ? ?bool "MSM7x00A / MSM7x01A" +> > - ? ? ? select MACH_TROUT if !MACH_HALIBUT +> > + ? ? ? select MACH_TROUT if (!MACH_HALIBUT && !MACH_SAPPHIRE) > > Better, thanks! > @@ -49,13 +49,13 @@ David > > --- a/arch/arm/mach-msm/Makefile > > +++ b/arch/arm/mach-msm/Makefile > > @@ -20,6 +20,7 @@ CFLAGS_scm.o :=$(call as-instr,.arch_extension sec,-DREQUIRES_SEC=1) -> > obj-$(CONFIG_HOTPLUG_CPU) += hotplug.o -> > obj-$(CONFIG_SMP) += headsmp.o platsmp.o +> > ?obj-$(CONFIG_HOTPLUG_CPU) += hotplug.o +> > ?obj-$(CONFIG_SMP) += headsmp.o platsmp.o > > > > +obj-$(CONFIG_MACH_SAPPHIRE) += board-sapphire.o devices-msm7x00.o -> > obj-$(CONFIG_MACH_TROUT) += board-trout.o board-trout-gpio.o board-trout-mmc.o devices-msm7x00.o -> > obj-$(CONFIG_MACH_TROUT) += board-trout.o board-trout-gpio.o board-trout-mmc.o board-trout-panel.o devices-msm7x00.o -> > obj-$(CONFIG_MACH_HALIBUT) += board-halibut.o devices-msm7x00.o +> > ?obj-$(CONFIG_MACH_TROUT) += board-trout.o board-trout-gpio.o board-trout-mmc.o devices-msm7x00.o +> > ?obj-$(CONFIG_MACH_TROUT) += board-trout.o board-trout-gpio.o board-trout-mmc.o board-trout-panel.o devices-msm7x00.o +> > ?obj-$(CONFIG_MACH_HALIBUT) += board-halibut.o devices-msm7x00.o > > Unrelated to this change per se, but it seems like devices-msm7x00.o > should be on an obj-$(CONFIG_ARCH_MSM7X00A) statement instead of diff --git a/a/content_digest b/N1/content_digest index f6f3ce6..93b3294 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,16 +1,10 @@ "ref\0CAOesGMiHfQwWXSQwvcEPxY63FEjbsB7ux4dHvAPM99Kf43cDZw@mail.gmail.com\0" "ref\01336781737-31470-1-git-send-email-davidb@codeaurora.org\0" "ref\0CAOesGMi1UyNTWjTapVb64QQwTCCFJydLC7zurPP3ULhLRGvu3g@mail.gmail.com\0" - "From\0David Brown <davidb@codeaurora.org>\0" - "Subject\0Re: [PATCH v2] arm: msm: fix up very basic HTC Sapphire support\0" + "From\0davidb@codeaurora.org (David Brown)\0" + "Subject\0[PATCH v2] arm: msm: fix up very basic HTC Sapphire support\0" "Date\0Sat, 12 May 2012 00:17:27 -0700\0" - "To\0Daniel Walker <dwalker@fifo99.com>\0" - "Cc\0Olof Johansson <olof@lixom.net>" - Bryan Huntsman <bryanh@codeaurora.org> - Russell King <linux@arm.linux.org.uk> - linux-kernel@vger.kernel.org - linux-arm-msm@vger.kernel.org - " linux-arm-kernel@lists.infradead.org\0" + "To\0linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" "On Fri, May 11, 2012 at 10:45:52PM -0700, Olof Johansson wrote:\n" @@ -30,7 +24,7 @@ "> > Adds sapphire into the make file, and fixes all the code problems that\n" "> > prevented it from building (including adding board-sapphire.h)\n" "> >\n" - "> > [davidb@codeaurora.org: Move MACH_TROUT selection back under\n" + "> > [davidb at codeaurora.org: Move MACH_TROUT selection back under\n" "> > ARCH_MSM7X00A]\n" "> >\n" "> > Signed-off-by: Daniel Walker <dwalker@fifo99.com>\n" @@ -38,12 +32,12 @@ "> > ---\n" "> > v2 - Moved MACH_TROUT selection back under the ARCH config target\n" "> >\n" - "> > \302\240arch/arm/mach-msm/Kconfig \302\240 \302\240 \302\240 \302\240 \302\240| \302\240 \302\2409 +-\n" - "> > \302\240arch/arm/mach-msm/Makefile \302\240 \302\240 \302\240 \302\240 | \302\240 \302\2401 +\n" - "> > \302\240arch/arm/mach-msm/board-sapphire.c | \302\240 18 +--\n" - "> > \302\240arch/arm/mach-msm/board-sapphire.h | \302\240224 ++++++++++++++++++++++++++++++++++++\n" - "> > \302\2404 files changed, 234 insertions(+), 18 deletions(-)\n" - "> > \302\240create mode 100644 arch/arm/mach-msm/board-sapphire.h\n" + "> > ?arch/arm/mach-msm/Kconfig ? ? ? ? ?| ? ?9 +-\n" + "> > ?arch/arm/mach-msm/Makefile ? ? ? ? | ? ?1 +\n" + "> > ?arch/arm/mach-msm/board-sapphire.c | ? 18 +--\n" + "> > ?arch/arm/mach-msm/board-sapphire.h | ?224 ++++++++++++++++++++++++++++++++++++\n" + "> > ?4 files changed, 234 insertions(+), 18 deletions(-)\n" + "> > ?create mode 100644 arch/arm/mach-msm/board-sapphire.h\n" "> >\n" "> > diff --git a/arch/arm/mach-msm/Kconfig b/arch/arm/mach-msm/Kconfig\n" "> > index 1cd40ad..70eae63 100644\n" @@ -51,10 +45,10 @@ "> > +++ b/arch/arm/mach-msm/Kconfig\n" "> > @@ -6,7 +6,7 @@ choice\n" "> >\n" - "> > \302\240config ARCH_MSM7X00A\n" - "> > \302\240 \302\240 \302\240 \302\240bool \"MSM7x00A / MSM7x01A\"\n" - "> > - \302\240 \302\240 \302\240 select MACH_TROUT if !MACH_HALIBUT\n" - "> > + \302\240 \302\240 \302\240 select MACH_TROUT if (!MACH_HALIBUT && !MACH_SAPPHIRE)\n" + "> > ?config ARCH_MSM7X00A\n" + "> > ? ? ? ?bool \"MSM7x00A / MSM7x01A\"\n" + "> > - ? ? ? select MACH_TROUT if !MACH_HALIBUT\n" + "> > + ? ? ? select MACH_TROUT if (!MACH_HALIBUT && !MACH_SAPPHIRE)\n" "> \n" "> Better, thanks!\n" "> \n" @@ -64,13 +58,13 @@ "> > --- a/arch/arm/mach-msm/Makefile\n" "> > +++ b/arch/arm/mach-msm/Makefile\n" "> > @@ -20,6 +20,7 @@ CFLAGS_scm.o :=$(call as-instr,.arch_extension sec,-DREQUIRES_SEC=1)\n" - "> > \302\240obj-$(CONFIG_HOTPLUG_CPU) += hotplug.o\n" - "> > \302\240obj-$(CONFIG_SMP) += headsmp.o platsmp.o\n" + "> > ?obj-$(CONFIG_HOTPLUG_CPU) += hotplug.o\n" + "> > ?obj-$(CONFIG_SMP) += headsmp.o platsmp.o\n" "> >\n" "> > +obj-$(CONFIG_MACH_SAPPHIRE) += board-sapphire.o devices-msm7x00.o\n" - "> > \302\240obj-$(CONFIG_MACH_TROUT) += board-trout.o board-trout-gpio.o board-trout-mmc.o devices-msm7x00.o\n" - "> > \302\240obj-$(CONFIG_MACH_TROUT) += board-trout.o board-trout-gpio.o board-trout-mmc.o board-trout-panel.o devices-msm7x00.o\n" - "> > \302\240obj-$(CONFIG_MACH_HALIBUT) += board-halibut.o devices-msm7x00.o\n" + "> > ?obj-$(CONFIG_MACH_TROUT) += board-trout.o board-trout-gpio.o board-trout-mmc.o devices-msm7x00.o\n" + "> > ?obj-$(CONFIG_MACH_TROUT) += board-trout.o board-trout-gpio.o board-trout-mmc.o board-trout-panel.o devices-msm7x00.o\n" + "> > ?obj-$(CONFIG_MACH_HALIBUT) += board-halibut.o devices-msm7x00.o\n" "> \n" "> Unrelated to this change per se, but it seems like devices-msm7x00.o\n" "> should be on an obj-$(CONFIG_ARCH_MSM7X00A) statement instead of\n" @@ -105,4 +99,4 @@ "Sent by an employee of the Qualcomm Innovation Center, Inc.\n" The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum. -9fb4318e6f10e7622669d57841ff0489064628ea997c094c476744e08e9fc223 +fd7f1a246de0c043a8ec64960ea7f525f2760b94b38cb58db575515cb52678ee
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.