Merge branch 'core-iommu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

[safe/jmp/linux-2.6] / include / linux / i2c-pnx.h

diff --git a/include/linux/i2c-pnx.h b/include/linux/i2c-pnx.h
index 9035711..a87124d 100644 (file)
--- a/include/linux/i2c-pnx.h
+++ b/include/linux/i2c-pnx.h
@@ -25,16 +25,18 @@ struct i2c_pnx_mif {
 };
 
 struct i2c_pnx_algo_data {
-       u32                     base;
-       u32                     ioaddr;
-       int                     irq;
+       void __iomem            *ioaddr;
        struct i2c_pnx_mif      mif;
        int                     last;
        struct clk              *clk;
+       struct i2c_pnx_data     *i2c_pnx;
+       struct i2c_adapter      adapter;
 };
 
 struct i2c_pnx_data {
-       struct i2c_adapter *adapter;
+       const char *name;
+       u32 base;
+       int irq;
 };
 
 #endif /* __I2C_PNX_H__ */