diff options
| author | Brian Norris <computersforpeace@gmail.com> | 2015-09-13 18:41:29 -0700 |
|---|---|---|
| committer | Brian Norris <computersforpeace@gmail.com> | 2015-09-13 18:41:29 -0700 |
| commit | db66e32e0d2ae1f5070faa589aa460b75780ab47 (patch) | |
| tree | feafcfb8f6ae92fabcd4de7d83e839cc301530bc /drivers/mtd/devices | |
| parent | f9f3ce835ddce3c669eee869253105f88819888b (diff) | |
| parent | 6ff33f3902c3b1c5d0db6b1e2c70b6d76fba357f (diff) | |
| download | linux-db66e32e0d2ae1f5070faa589aa460b75780ab47.tar.bz2 | |
Merge tag 'v4.3-rc1' into MTD -next development
Diffstat (limited to 'drivers/mtd/devices')
| -rw-r--r-- | drivers/mtd/devices/slram.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/mtd/devices/slram.c b/drivers/mtd/devices/slram.c index 2fc4957cbe7f..a70eb83e68f1 100644 --- a/drivers/mtd/devices/slram.c +++ b/drivers/mtd/devices/slram.c @@ -41,7 +41,7 @@ #include <linux/fs.h> #include <linux/ioctl.h> #include <linux/init.h> -#include <asm/io.h> +#include <linux/io.h> #include <linux/mtd/mtd.h> |