Merge branch 'linux-2.6'

1 files changed, 2 insertions, 2 deletions

diff --git a/include/linux/atmdev.h b/include/linux/atmdev.h
index 2096e5c72827..a3d07c29d16c 100644
--- a/include/linux/atmdev.h
+++ b/include/linux/atmdev.h
@@ -359,7 +359,7 @@ struct atm_dev {
         struct proc_dir_entry *proc_entry; /* proc entry */
         char *proc_name;                /* proc entry name */
 #endif
-        struct class_device class_dev;  /* sysfs class device */
+        struct device class_dev;        /* sysfs device */
         struct list_head dev_list;      /* linkage */
 };
 
@@ -461,7 +461,7 @@ static inline void atm_dev_put(struct atm_dev *dev)
                 BUG_ON(!test_bit(ATM_DF_REMOVED, &dev->flags));
                 if (dev->ops->dev_close)
                         dev->ops->dev_close(dev);
-                class_device_put(&dev->class_dev);
+                put_device(&dev->class_dev);
         }
 }