Merge ../bleed-2.6

[deliverable/linux.git] / include / linux / i2o.h

diff --git a/include/linux/i2o.h b/include/linux/i2o.h
index b4af45aad25df5bf8fb669983bae3eacf76c9d62..92300325dbcd30254b1bc72c0b65cd39c1b35b2d 100644 (file)
--- a/include/linux/i2o.h
+++ b/include/linux/i2o.h
@@ -66,8 +66,6 @@ struct i2o_device {
        struct device device;
 
        struct semaphore lock;  /* device lock */
-
-       struct class_device classdev;   /* i2o device class */
 };
 
 /*
@@ -194,7 +192,7 @@ struct i2o_controller {
        struct resource mem_resource;   /* Mem resource allocated to the IOP */
 
        struct device device;
-       struct class_device classdev;   /* I2O controller class */
+       struct class_device *classdev;  /* I2O controller class device */
        struct i2o_device *exec;        /* Executive */
 #if BITS_PER_LONG == 64
        spinlock_t context_list_lock;   /* lock for context_list */