linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [GIT PULL] ARM MSM updates for 2.6.35-rc1
@ 2010-05-27 21:52 Daniel Walker
  2010-06-02 20:50 ` Daniel Walker
  0 siblings, 1 reply; 15+ messages in thread
From: Daniel Walker @ 2010-05-27 21:52 UTC (permalink / raw)
  To: Linus Torvalds; +Cc: linux-kernel, linux-arm-msm

Hi Linus,

Here's a couple of simple patches. One fixes a compile failure in
certain situations, and the other is just dead code removal.

Daniel


The following changes since commit 7b52161d14fa8a22a2387f4aa2fb7b854587830d:

  msm: 7x30 Kconfig and makefile changes (2010-05-13 16:08:55 -0700)

are available in the git repository at:
  git://codeaurora.org/quic/kernel/dwalker/linux-msm.git msm-core

Daniel Walker (1):
      msm: dma: add completion.h header

Huang Weiyi (1):
      arm: msm: remove unused #include <linux/version.h>

 arch/arm/mach-msm/acpuclock-arm11.c |    1 -
 arch/arm/mach-msm/clock.c           |    1 -
 arch/arm/mach-msm/dma.c             |    1 +
 3 files changed, 1 insertions(+), 2 deletions(-)

diff --git a/arch/arm/mach-msm/acpuclock-arm11.c b/arch/arm/mach-msm/acpuclock-arm11.c
index af5e85b..6ca42fd 100644
--- a/arch/arm/mach-msm/acpuclock-arm11.c
+++ b/arch/arm/mach-msm/acpuclock-arm11.c
@@ -17,7 +17,6 @@
  *
  */
 
-#include <linux/version.h>
 #include <linux/kernel.h>
 #include <linux/init.h>
 #include <linux/list.h>
diff --git a/arch/arm/mach-msm/clock.c b/arch/arm/mach-msm/clock.c
index 9cb1276..c57210f 100644
--- a/arch/arm/mach-msm/clock.c
+++ b/arch/arm/mach-msm/clock.c
@@ -14,7 +14,6 @@
  *
  */
 
-#include <linux/version.h>
 #include <linux/kernel.h>
 #include <linux/init.h>
 #include <linux/module.h>
diff --git a/arch/arm/mach-msm/dma.c b/arch/arm/mach-msm/dma.c
index 3d725ae..3db0bfe 100644
--- a/arch/arm/mach-msm/dma.c
+++ b/arch/arm/mach-msm/dma.c
@@ -17,6 +17,7 @@
 #include <linux/err.h>
 #include <linux/io.h>
 #include <linux/interrupt.h>
+#include <linux/completion.h>
 #include <mach/dma.h>
 
 #define MSM_DMOV_CHANNEL_COUNT 16



^ permalink raw reply related	[flat|nested] 15+ messages in thread

end of thread, other threads:[~2010-06-04  9:21 UTC | newest]

Thread overview: 15+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-05-27 21:52 [GIT PULL] ARM MSM updates for 2.6.35-rc1 Daniel Walker
2010-06-02 20:50 ` Daniel Walker
2010-06-02 21:27   ` Linus Torvalds
2010-06-02 21:39     ` Linus Torvalds
2010-06-02 21:56       ` Daniel Walker
2010-06-02 22:30     ` Daniel Walker
2010-06-02 23:27     ` Kevin Hilman
2010-06-03  1:20       ` Linus Torvalds
2010-06-03  3:44         ` Michael Ellerman
2010-06-03  4:26           ` Linus Torvalds
2010-06-03 16:11             ` Tony Lindgren
2010-06-04  5:34             ` Eric Miao
2010-06-03  4:45         ` Ben Dooks
2010-06-03  5:36         ` Ben Dooks
2010-06-04  8:27         ` Vincent Sanders

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).