vfat: Fix vfat_find() error path in vfat_lookup()

[linux-2.6-omap-h63xx.git] / drivers / mfd / ucb1x00.h

diff --git a/drivers/mfd/ucb1x00.h b/drivers/mfd/ucb1x00.h
index ca8df8072d433ff77b04218dbb81c00f1e0e029d..a8ad8a0ed5dbbf0f763cf2e900ada34e55311daf 100644 (file)
--- a/drivers/mfd/ucb1x00.h
+++ b/drivers/mfd/ucb1x00.h
@@ -120,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;
 };
@@ -144,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 *);