diff options
| author | Tony Lindgren <tony@atomide.com> | 2010-10-08 11:10:36 -0700 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2010-10-08 11:10:36 -0700 |
| commit | a7c887510073b2f403e123f2befa40bf93554df9 (patch) | |
| tree | afee0628d0688bb2460cfd4eb1ee4cc8281e925c /arch/arm/mach-omap2/board-omap4panda.c | |
| parent | 4415beb6fb519c4e98491666838494a8c46cc3ee (diff) | |
| parent | 4367260c0bc1773c00b2309a31b31657cabfda3f (diff) | |
| download | lwn-a7c887510073b2f403e123f2befa40bf93554df9.tar.gz lwn-a7c887510073b2f403e123f2befa40bf93554df9.zip | |
Merge branch 'control_mcbsp_fix_2.6.37' of git://git.pwsan.com/linux-2.6 into omap-for-linus
Diffstat (limited to 'arch/arm/mach-omap2/board-omap4panda.c')
| -rw-r--r-- | arch/arm/mach-omap2/board-omap4panda.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-omap2/board-omap4panda.c b/arch/arm/mach-omap2/board-omap4panda.c index 5eb1a77bf0e5..a9d8a19ada7e 100644 --- a/arch/arm/mach-omap2/board-omap4panda.c +++ b/arch/arm/mach-omap2/board-omap4panda.c @@ -34,12 +34,12 @@ #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 |