Merge remote-tracking branch 'torvalds/master' into perf/core

[sfrench/cifs-2.6.git] / include / linux / nd.h

diff --git a/include/linux/nd.h b/include/linux/nd.h
index 55c7359978054cd586a9172a58e3240ad3ae7868..cec526c8043d5be4cef245e475989a2d65e7a6ec 100644 (file)
--- a/include/linux/nd.h
+++ b/include/linux/nd.h
@@ -26,7 +26,7 @@ struct nd_device_driver {
        struct device_driver drv;
        unsigned long type;
        int (*probe)(struct device *dev);
-       int (*remove)(struct device *dev);
+       void (*remove)(struct device *dev);
        void (*shutdown)(struct device *dev);
        void (*notify)(struct device *dev, enum nvdimm_event event);
 };