diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-08-14 13:33:39 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-08-14 13:33:39 -0700 |
| commit | f75f6ff2eaa626d32dd3225e3008f807741ad1c5 (patch) | |
| tree | 91446916eff11bc8b900ca4a4a67561021354e53 /drivers/dax/device-dax.h | |
| parent | c92316bf8e94830a0225f2e904cbdbd173768419 (diff) | |
| parent | ef954844c7ace62f773f4f23e28d2d915adc419f (diff) | |
Merge 4.13-rc5 into driver-core-next
We want the fixes in here as well for testing.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/dax/device-dax.h')
| -rw-r--r-- | drivers/dax/device-dax.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/dax/device-dax.h b/drivers/dax/device-dax.h index fdcd9769ffde..688b051750bd 100644 --- a/drivers/dax/device-dax.h +++ b/drivers/dax/device-dax.h @@ -21,5 +21,5 @@ struct dax_region *alloc_dax_region(struct device *parent, int region_id, struct resource *res, unsigned int align, void *addr, unsigned long flags); struct dev_dax *devm_create_dev_dax(struct dax_region *dax_region, - struct resource *res, int count); + int id, struct resource *res, int count); #endif /* __DEVICE_DAX_H__ */ |