From: Russell King <rmk@dyn-67.arm.linux.org.uk>
Date: Wed, 25 Mar 2009 18:31:35 +0000 (+0000)
Subject: Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux... 
X-Git-Tag: firefly_0821_release~15211^2~9
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=8937b7349ca9e25a02b2a72ccb7fba404ddedc5b;p=firefly-linux-kernel-4.4.55.git

Merge branch 'for-next' of git://git./linux/kernel/git/tmlind/linux-omap-2.6 into devel
---

8937b7349ca9e25a02b2a72ccb7fba404ddedc5b
diff --cc arch/arm/mach-omap2/board-ldp.c
index c71580557c62,92661e5df93e..e096f776f996
--- a/arch/arm/mach-omap2/board-ldp.c
+++ b/arch/arm/mach-omap2/board-ldp.c
@@@ -36,8 -34,10 +35,9 @@@
  #include <mach/common.h>
  #include <mach/gpmc.h>
  
 -#include <asm/io.h>
  #include <asm/delay.h>
  #include <mach/control.h>
+ #include <mach/usb.h>
  
  #include "mmc-twl4030.h"
  
diff --cc arch/arm/plat-omap/include/mach/system.h
index cb8c0ef30fba,8422845c5b62..1060e345423b
--- a/arch/arm/plat-omap/include/mach/system.h
+++ b/arch/arm/plat-omap/include/mach/system.h
@@@ -9,12 -9,14 +9,14 @@@
  #include <asm/mach-types.h>
  #include <mach/hardware.h>
  
 +#include <mach/prcm.h>
 +
  #ifndef CONFIG_MACH_VOICEBLUE
  #define voiceblue_reset()		do {} while (0)
+ #else
+ extern void voiceblue_reset(void);
  #endif
  
 -extern void omap_prcm_arch_reset(char mode);
 -
  static inline void arch_idle(void)
  {
  	cpu_do_idle();