Merge branch 'linus' into x86/xen

Conflicts:
	arch/x86/kernel/paravirt.c

Signed-off-by: Ingo Molnar <mingo@elte.hu>

1 files changed, 2 insertions, 2 deletions

diff --git a/arch/arm/mach-ixp4xx/fsg-setup.c b/arch/arm/mach-ixp4xx/fsg-setup.c
index 0db3a909ae61..501dfdcc39fe 100644
--- a/arch/arm/mach-ixp4xx/fsg-setup.c
+++ b/arch/arm/mach-ixp4xx/fsg-setup.c
@@ -64,7 +64,7 @@ static struct platform_device fsg_i2c_gpio = {
 
 static struct i2c_board_info __initdata fsg_i2c_board_info [] = {
         {
-                I2C_BOARD_INFO("rtc-isl1208", 0x6f),
+                I2C_BOARD_INFO("isl1208", 0x6f),
         },
 };
 
@@ -179,7 +179,6 @@ static void __init fsg_init(void)
 {
         DECLARE_MAC_BUF(mac_buf);
         uint8_t __iomem *f;
-        int i;
 
         ixp4xx_sys_init();
 
@@ -228,6 +227,7 @@ static void __init fsg_init(void)
         f = ioremap(IXP4XX_EXP_BUS_BASE(0), 0x400000);
         if (f) {
 #ifdef __ARMEB__
+                int i;
                 for (i = 0; i < 6; i++) {
                         fsg_plat_eth[0].hwaddr[i] = readb(f + 0x3C0422 + i);
                         fsg_plat_eth[1].hwaddr[i] = readb(f + 0x3C043B + i);