From 7d419ffa8425fd1a53fe5f73b48607059aab6a81 Mon Sep 17 00:00:00 2001 From: Lesly A M Date: Thu, 14 Apr 2011 17:57:51 +0530 Subject: [PATCH] --- yaml --- r: 251927 b: refs/heads/master c: d7ac829fa30d44d6553a0ead41f47bb92ee4d73e h: refs/heads/master i: 251925: ffb90272265bd304770ac0ea68eac5dab5172fa6 251923: 5c3edd739d7cb4c5bffbdfa32260bc0a31fa8132 251919: 193db43b3bc0c0683406556bd6882beffc2e8c32 v: v3 --- [refs] | 2 +- trunk/arch/arm/mach-omap2/board-rx51-peripherals.c | 2 +- trunk/drivers/mfd/twl4030-power.c | 2 +- trunk/include/linux/i2c/twl.h | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 33b68c277c0d..0efccde3d498 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1f968ff61f2987f500832e93b9b704f26adadea6 +refs/heads/master: d7ac829fa30d44d6553a0ead41f47bb92ee4d73e diff --git a/trunk/arch/arm/mach-omap2/board-rx51-peripherals.c b/trunk/arch/arm/mach-omap2/board-rx51-peripherals.c index bbcb6775a6a3..01ee0a15ef88 100644 --- a/trunk/arch/arm/mach-omap2/board-rx51-peripherals.c +++ b/trunk/arch/arm/mach-omap2/board-rx51-peripherals.c @@ -730,7 +730,7 @@ static struct twl4030_resconfig twl4030_rconfig[] __initdata = { { .resource = RES_RESET, .devgroup = -1, .type = 1, .type2 = -1, .remap_off = -1, .remap_sleep = -1 }, - { .resource = RES_Main_Ref, .devgroup = -1, + { .resource = RES_MAIN_REF, .devgroup = -1, .type = 1, .type2 = -1, .remap_off = -1, .remap_sleep = -1 }, { 0, 0}, diff --git a/trunk/drivers/mfd/twl4030-power.c b/trunk/drivers/mfd/twl4030-power.c index 8373d79323cc..8162e435c9ff 100644 --- a/trunk/drivers/mfd/twl4030-power.c +++ b/trunk/drivers/mfd/twl4030-power.c @@ -120,7 +120,7 @@ static u8 res_config_addrs[] = { [RES_HFCLKOUT] = 0x8b, [RES_32KCLKOUT] = 0x8e, [RES_RESET] = 0x91, - [RES_Main_Ref] = 0x94, + [RES_MAIN_REF] = 0x94, }; static int __init twl4030_write_script_byte(u8 address, u8 byte) diff --git a/trunk/include/linux/i2c/twl.h b/trunk/include/linux/i2c/twl.h index 0c0d1ae79981..4ebd7c32bc59 100644 --- a/trunk/include/linux/i2c/twl.h +++ b/trunk/include/linux/i2c/twl.h @@ -501,7 +501,7 @@ static inline int twl6030_mmc_card_detect(struct device *dev, int slot) #define RES_32KCLKOUT 26 #define RES_RESET 27 /* Power Reference */ -#define RES_Main_Ref 28 +#define RES_MAIN_REF 28 #define TOTAL_RESOURCES 28 /*