aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-shmobile/board-marzen.c
diff options
context:
space:
mode:
Diffstat (limited to 'arch/arm/mach-shmobile/board-marzen.c')
-rw-r--r--arch/arm/mach-shmobile/board-marzen.c8
1 files changed, 5 insertions, 3 deletions
diff --git a/arch/arm/mach-shmobile/board-marzen.c b/arch/arm/mach-shmobile/board-marzen.c
index 6ed324ce848f..e5cf4201e769 100644
--- a/arch/arm/mach-shmobile/board-marzen.c
+++ b/arch/arm/mach-shmobile/board-marzen.c
@@ -41,14 +41,16 @@
41#include <linux/mmc/host.h> 41#include <linux/mmc/host.h>
42#include <linux/mmc/sh_mobile_sdhi.h> 42#include <linux/mmc/sh_mobile_sdhi.h>
43#include <linux/mfd/tmio.h> 43#include <linux/mfd/tmio.h>
44
44#include <media/soc_camera.h> 45#include <media/soc_camera.h>
45#include <mach/r8a7779.h>
46#include <mach/common.h>
47#include <mach/irqs.h>
48#include <asm/mach-types.h> 46#include <asm/mach-types.h>
49#include <asm/mach/arch.h> 47#include <asm/mach/arch.h>
50#include <asm/traps.h> 48#include <asm/traps.h>
51 49
50#include "common.h"
51#include "irqs.h"
52#include "r8a7779.h"
53
52/* Fixed 3.3V regulator to be used by SDHI0 */ 54/* Fixed 3.3V regulator to be used by SDHI0 */
53static struct regulator_consumer_supply fixed3v3_power_consumers[] = { 55static struct regulator_consumer_supply fixed3v3_power_consumers[] = {
54 REGULATOR_SUPPLY("vmmc", "sh_mobile_sdhi.0"), 56 REGULATOR_SUPPLY("vmmc", "sh_mobile_sdhi.0"),