From c9ff8ea4b162f73bf3c9bb65ca265dfb6c38daf5 Mon Sep 17 00:00:00 2001 From: Peter Ujfalusi Date: Thu, 21 Jun 2012 01:36:02 -0700 Subject: [PATCH] --- yaml --- r: 313002 b: refs/heads/master c: da0085ff9b2ca9ad21fd9fb380247e6639cccacd h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/arm/mach-omap2/twl-common.c | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 8c561d069d91..dbd974214eb6 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 97ee9f01d6f26a69847d7a0ea07be756fe9f8eb6 +refs/heads/master: da0085ff9b2ca9ad21fd9fb380247e6639cccacd diff --git a/trunk/arch/arm/mach-omap2/twl-common.c b/trunk/arch/arm/mach-omap2/twl-common.c index 119d5a910f3a..5447c135633f 100644 --- a/trunk/arch/arm/mach-omap2/twl-common.c +++ b/trunk/arch/arm/mach-omap2/twl-common.c @@ -48,6 +48,7 @@ static struct i2c_board_info __initdata omap4_i2c1_board_info[] = { }, }; +#if defined(CONFIG_ARCH_OMAP3) || defined(CONFIG_ARCH_OMAP4) static int twl_set_voltage(void *data, int target_uV) { struct voltagedomain *voltdm = (struct voltagedomain *)data; @@ -59,6 +60,7 @@ static int twl_get_voltage(void *data) struct voltagedomain *voltdm = (struct voltagedomain *)data; return voltdm_get_voltage(voltdm); } +#endif void __init omap_pmic_init(int bus, u32 clkrate, const char *pmic_type, int pmic_irq,