Merge branch 'for-linus/i2c' of git://git.fluff.org/bjdooks/linux

[safe/jmp/linux-2.6] / drivers / mfd / twl-core.c

diff --git a/drivers/mfd/twl-core.c b/drivers/mfd/twl-core.c
index 7ccc39f..562cd49 100644 (file)
--- a/drivers/mfd/twl-core.c
+++ b/drivers/mfd/twl-core.c
@@ -198,6 +198,7 @@
 /* subchip/slave 3 0x4B - AUDIO */
 #define TWL6030_BASEADD_AUDIO          0x0000
 #define TWL6030_BASEADD_RSV            0x0000
+#define TWL6030_BASEADD_ZERO           0x0000
 
 /* Few power values */
 #define R_CFG_BOOT                     0x05
@@ -313,9 +314,11 @@ static struct twl_mapping twl6030_map[] = {
        { SUB_CHIP_ID1, TWL6030_BASEADD_CHARGER },
        { SUB_CHIP_ID1, TWL6030_BASEADD_GASGAUGE },
        { SUB_CHIP_ID1, TWL6030_BASEADD_PWM },
-       { SUB_CHIP_ID2, TWL6030_BASEADD_RSV },
-       { SUB_CHIP_ID2, TWL6030_BASEADD_RSV },
+       { SUB_CHIP_ID0, TWL6030_BASEADD_ZERO },
+       { SUB_CHIP_ID1, TWL6030_BASEADD_ZERO },
 
+       { SUB_CHIP_ID2, TWL6030_BASEADD_ZERO },
+       { SUB_CHIP_ID2, TWL6030_BASEADD_ZERO },
        { SUB_CHIP_ID2, TWL6030_BASEADD_RSV },
        { SUB_CHIP_ID2, TWL6030_BASEADD_RSV },
        { SUB_CHIP_ID2, TWL6030_BASEADD_RSV },