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

diff --cc arch/arm/mach-omap2/board-omap4panda.c
index 5eb1a77bf0e58a799fe8c0e49fde31f622098f96,992a03e248c5bb04ab3646e12f74fddb133b0698..a9d8a19ada7e6ad6355cab1455d4c95b481fb61a
--- 1/arch/arm/mach-omap2/board-omap4panda.c
--- 2/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",