diff options
| author | Dan Williams <dan.j.williams@intel.com> | 2015-08-28 01:40:26 +0200 |
|---|---|---|
| committer | Dan Williams <dan.j.williams@intel.com> | 2015-08-28 01:40:26 +0200 |
| commit | 4a9bf88a5caa8495b5eb2b738d5fb40924bbc538 (patch) | |
| tree | 7c2901cb67a7dd7c863fee6924afe24be79cddab /drivers/isdn/icn | |
| parent | nvdimm: change to use generic kvfree() (diff) | |
| parent | nd_blk: change aperture mapping from WC to WB (diff) | |
| download | linux-4a9bf88a5caa8495b5eb2b738d5fb40924bbc538.tar.xz linux-4a9bf88a5caa8495b5eb2b738d5fb40924bbc538.zip | |
Merge branch 'pmem-api' into libnvdimm-for-next
Diffstat (limited to 'drivers/isdn/icn')
| -rw-r--r-- | drivers/isdn/icn/icn.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/isdn/icn/icn.h b/drivers/isdn/icn/icn.h index b713466997a0..f8f2e76d34bf 100644 --- a/drivers/isdn/icn/icn.h +++ b/drivers/isdn/icn/icn.h @@ -38,7 +38,7 @@ typedef struct icn_cdef { #include <linux/errno.h> #include <linux/fs.h> #include <linux/major.h> -#include <asm/io.h> +#include <linux/io.h> #include <linux/kernel.h> #include <linux/signal.h> #include <linux/slab.h> |