gistfile1.diff

diff --git a/arch/arm/mach-omap2/board-encore.c b/arch/arm/mach-omap2/board-encore.c
index 66a6b48..144193c 100755
--- a/arch/arm/mach-omap2/board-encore.c
+++ b/arch/arm/mach-omap2/board-encore.c
@@ -728,7 +728,7 @@ static struct regulator_init_data boxer_vdsi = {
        .consumer_supplies      = &boxer_vdds_dsi_supply,
 };
 
-static struct twl4030_hsmmc_info mmc[] = {
+static struct twl4030_hsmmc_info mmc[] __initdata = {
        {
                .mmc            = 1,
                .wires          = 4,
@@ -747,7 +747,7 @@ static struct twl4030_hsmmc_info mmc[] = {
        {}      /* Terminator */
 };
 
-static int __ref boxer_twl_gpio_setup(struct device *dev,
+static int boxer_twl_gpio_setup(struct device *dev,
                unsigned gpio, unsigned ngpio)
 {
        /* gpio + 0 is "mmc0_cd" (input/IRQ),
@@ -894,7 +894,7 @@ static struct twl4030_power_data boxer_t2scripts_data = {
        .resource_config = twl4030_rconfig,
 };
 
-static struct twl4030_platform_data __refdata boxer_twldata = {
+static struct twl4030_platform_data boxer_twldata = {
        .irq_base       = TWL4030_IRQ_BASE,
        .irq_end        = TWL4030_IRQ_END,
 
@@ -1168,7 +1168,7 @@ static struct i2c_board_info __initdata boxer_i2c_bus1_info[] = {
        },
 #endif /*CONFIG_BATTERY_MAX17042*/     
        {
-               I2C_BOARD_INFO("tps65921", 0x48),
+               I2C_BOARD_INFO("twl4030", 0x48),
                .flags = I2C_CLIENT_WAKE,
                .irq = INT_34XX_SYS_NIRQ,
                .platform_data = &boxer_twldata,