Merge branch 'fixes-rc1' into fixes

[linux-2.6-microblaze.git] / arch / arm / mach-davinci / board-sffsdr.c

diff --git a/arch/arm/mach-davinci/board-sffsdr.c b/arch/arm/mach-davinci/board-sffsdr.c
index 79b4795..6930b2f 100644 (file)
--- a/arch/arm/mach-davinci/board-sffsdr.c
+++ b/arch/arm/mach-davinci/board-sffsdr.c
@@ -84,10 +84,14 @@ static const struct property_entry eeprom_properties[] = {
        { }
 };
 
+static const struct software_node eeprom_node = {
+       .properties = eeprom_properties,
+};
+
 static struct i2c_board_info __initdata i2c_info[] =  {
        {
                I2C_BOARD_INFO("24c64", 0x50),
-               .properties = eeprom_properties,
+               .swnode = &eeprom_node,
        },
        /* Other I2C devices:
         * MSP430,  addr 0x23 (not used)