Merge branches 'release' and 'autoload' into release

[linux-2.6] / include / linux / tifm.h

diff --git a/include/linux/tifm.h b/include/linux/tifm.h
index 6b3a31805c72ff2e5d450697e15afc5e507d2599..2096b76d0cee68efe8cd91571e69da3c36bffd2c 100644 (file)
--- a/include/linux/tifm.h
+++ b/include/linux/tifm.h
@@ -120,7 +120,7 @@ struct tifm_adapter {
        struct completion   *finish_me;
 
        struct work_struct  media_switcher;
-       struct class_device cdev;
+       struct device       dev;
 
        void                (*eject)(struct tifm_adapter *fm,
                                     struct tifm_dev *sock);