Merge branch 'for-linus' of git://git.o-hand.com/linux-rpurdie-leds

[linux-2.6-omap-h63xx.git] / drivers / char / ipmi / ipmi_si_sm.h

diff --git a/drivers/char/ipmi/ipmi_si_sm.h b/drivers/char/ipmi/ipmi_si_sm.h
index bf3d4962d6a5973c51d99f21cb7b5de0ad2be867..4b731b24dc16c79d2e688edafe9ac20837f60e45 100644 (file)
--- a/drivers/char/ipmi/ipmi_si_sm.h
+++ b/drivers/char/ipmi/ipmi_si_sm.h
@@ -50,11 +50,12 @@ struct si_sm_io
 
        /* Generic info used by the actual handling routines, the
            state machine shouldn't touch these. */
-       void *info;
        void __iomem *addr;
        int  regspacing;
        int  regsize;
        int  regshift;
+       int addr_type;
+       long addr_data;
 };
 
 /* Results of SMI events. */