Merge tag 'sound-fix-4.8-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai...

[karo-tx-linux.git] / include / linux / nd.h

diff --git a/include/linux/nd.h b/include/linux/nd.h
index aee2761d294cbc6a06ae32de2c66dd4533cade3d..f1ea426d6a5e9ca742b7ae02ec03548ccaccd34e 100644 (file)
--- a/include/linux/nd.h
+++ b/include/linux/nd.h
@@ -26,6 +26,7 @@ struct nd_device_driver {
        unsigned long type;
        int (*probe)(struct device *dev);
        int (*remove)(struct device *dev);
+       void (*shutdown)(struct device *dev);
        void (*notify)(struct device *dev, enum nvdimm_event event);
 };
 
@@ -67,7 +68,7 @@ struct nd_namespace_io {
        struct nd_namespace_common common;
        struct resource res;
        resource_size_t size;
-       void __pmem *addr;
+       void *addr;
        struct badblocks bb;
 };