diff options
| author | Brian Norris <computersforpeace@gmail.com> | 2015-09-14 04:41:29 +0300 |
|---|---|---|
| committer | Brian Norris <computersforpeace@gmail.com> | 2015-09-14 04:41:29 +0300 |
| commit | db66e32e0d2ae1f5070faa589aa460b75780ab47 (patch) | |
| tree | feafcfb8f6ae92fabcd4de7d83e839cc301530bc /include/linux/mtd | |
| parent | f9f3ce835ddce3c669eee869253105f88819888b (diff) | |
| parent | 6ff33f3902c3b1c5d0db6b1e2c70b6d76fba357f (diff) | |
| download | linux-db66e32e0d2ae1f5070faa589aa460b75780ab47.tar.xz | |
Merge tag 'v4.3-rc1' into MTD -next development
Diffstat (limited to 'include/linux/mtd')
| -rw-r--r-- | include/linux/mtd/map.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/mtd/map.h b/include/linux/mtd/map.h index 29975c73a953..366cf77953b5 100644 --- a/include/linux/mtd/map.h +++ b/include/linux/mtd/map.h @@ -27,9 +27,9 @@ #include <linux/string.h> #include <linux/bug.h> #include <linux/kernel.h> +#include <linux/io.h> #include <asm/unaligned.h> -#include <asm/io.h> #include <asm/barrier.h> #ifdef CONFIG_MTD_MAP_BANK_WIDTH_1 |