Merge commit 'v2.6.34-rc1' into for-2.6.35

[pandora-kernel.git] / include / linux / i2c-pnx.h

diff --git a/include/linux/i2c-pnx.h b/include/linux/i2c-pnx.h
index 9eb07bb..a87124d 100644 (file)
--- a/include/linux/i2c-pnx.h
+++ b/include/linux/i2c-pnx.h
@@ -12,9 +12,8 @@
 #ifndef __I2C_PNX_H__
 #define __I2C_PNX_H__
 
-#include <linux/pm.h>
-
 struct platform_device;
+struct clk;
 
 struct i2c_pnx_mif {
        int                     ret;            /* Return value */
@@ -26,20 +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 {
-       int (*suspend) (struct platform_device *pdev, pm_message_t state);
-       int (*resume) (struct platform_device *pdev);
-       u32 (*calculate_input_freq) (struct platform_device *pdev);
-       int (*set_clock_run) (struct platform_device *pdev);
-       int (*set_clock_stop) (struct platform_device *pdev);
-       struct i2c_adapter *adapter;
+       const char *name;
+       u32 base;
+       int irq;
 };
 
 #endif /* __I2C_PNX_H__ */