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

[pandora-kernel.git] / drivers / mfd / ucb1x00.h

diff --git a/drivers/mfd/ucb1x00.h b/drivers/mfd/ucb1x00.h
index 9c9a647..a8ad8a0 100644 (file)
--- a/drivers/mfd/ucb1x00.h
+++ b/drivers/mfd/ucb1x00.h
@@ -94,6 +94,7 @@
 #define UCB_ID         0x0c
 #define UCB_ID_1200            0x1004
 #define UCB_ID_1300            0x1005
+#define UCB_ID_TC35143          0x9712
 
 #define UCB_MODE       0x0d
 #define UCB_MODE_DYN_VFLAG_ENA (1 << 12)
@@ -119,7 +120,7 @@ struct ucb1x00 {
        u16                     irq_fal_enbl;
        u16                     irq_ris_enbl;
        struct ucb1x00_irq      irq_handler[16];
-       struct class_device     cdev;
+       struct device           dev;
        struct list_head        node;
        struct list_head        devs;
 };
@@ -143,7 +144,7 @@ struct ucb1x00_driver {
        int     (*resume)(struct ucb1x00_dev *dev);
 };
 
-#define classdev_to_ucb1x00(cd)        container_of(cd, struct ucb1x00, cdev)
+#define classdev_to_ucb1x00(cd)        container_of(cd, struct ucb1x00, dev)
 
 int ucb1x00_register_driver(struct ucb1x00_driver *);
 void ucb1x00_unregister_driver(struct ucb1x00_driver *);