From: Tony Lindgren <tony@atomide.com>
Date: Fri, 8 Oct 2010 18:10:36 +0000 (-0700)
Subject: Merge branch 'control_mcbsp_fix_2.6.37' of git://git.pwsan.com/linux-2.6 into omap... 
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=a7c887510073b2f403e123f2befa40bf93554df9;p=linux-beck.git

Merge branch 'control_mcbsp_fix_2.6.37' of git://git.pwsan.com/linux-2.6 into omap-for-linus
---

a7c887510073b2f403e123f2befa40bf93554df9
diff --cc arch/arm/mach-omap2/board-omap4panda.c
index 5eb1a77bf0e5,992a03e248c5..a9d8a19ada7e
--- a/arch/arm/mach-omap2/board-omap4panda.c
+++ b/arch/arm/mach-omap2/board-omap4panda.c
@@@ -34,16 -34,13 +34,16 @@@
  
  #include <plat/board.h>
  #include <plat/common.h>
- #include <plat/control.h>
  #include <plat/usb.h>
  #include <plat/mmc.h>
- #include "hsmmc.h"
  #include "timer-gp.h"
  
+ #include "hsmmc.h"
+ #include "control.h"
  
 +#define GPIO_HUB_POWER		1
 +#define GPIO_HUB_NRESET		62
 +
  static struct gpio_led gpio_leds[] = {
  	{
  		.name			= "pandaboard::status1",