vserver 1.9.3

[linux-2.6.git] / include / linux / device.h

diff --git a/include/linux/device.h b/include/linux/device.h
index 49d3865..4bb694c 100644 (file)
--- a/include/linux/device.h
+++ b/include/linux/device.h
@@ -59,7 +59,6 @@ struct bus_type {
        struct driver_attribute * drv_attrs;
 
        int             (*match)(struct device * dev, struct device_driver * drv);
-       struct device * (*add)  (struct device * parent, char * bus_id);
        int             (*hotplug) (struct device *dev, char **envp, 
                                    int num_envp, char *buffer, int buffer_size);
        int             (*suspend)(struct device * dev, u32 state);
@@ -285,6 +284,9 @@ struct device {
 
        struct list_head        dma_pools;      /* dma pools (if dma'ble) */
 
+       struct dma_coherent_mem *dma_mem; /* internal for coherent mem
+                                            override */
+
        void    (*release)(struct device * dev);
 };