diff options
| author |   Jiri Kosina <jkosina@suse.cz> | 2017-11-15 11:04:13 +0100 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2017-11-15 11:04:13 +0100 |
| commit | 5cc619db5c34146ee821acd08382b9d78579b52e (patch) | |
| tree | ee28e3cefdb35d56e33887f05db0a50589aa5883 /drivers/mtd/nand/fsmc_nand.c | |
| parent | Merge branch 'for-4.14/upstream-fixes' into for-linus (diff) | |
| parent | HID: alps: add new U1 device ID (diff) | |
| download | linux-dev-5cc619db5c34146ee821acd08382b9d78579b52e.tar.xz linux-dev-5cc619db5c34146ee821acd08382b9d78579b52e.zip | |
Merge branch 'for-4.15/alps' into for-linus
- New ALPS touchpad (T4, found currently on HP EliteBook 1000, Zbook Stduio
and HP Elite book x360) support from Masaki Ota
Diffstat (limited to 'drivers/mtd/nand/fsmc_nand.c')
| -rw-r--r-- | drivers/mtd/nand/fsmc_nand.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/mtd/nand/fsmc_nand.c b/drivers/mtd/nand/fsmc_nand.c index 9d8b051d3187..eac15d9bf49e 100644 --- a/drivers/mtd/nand/fsmc_nand.c +++ b/drivers/mtd/nand/fsmc_nand.c @@ -28,7 +28,7 @@ #include <linux/sched.h> #include <linux/types.h> #include <linux/mtd/mtd.h> -#include <linux/mtd/nand.h> +#include <linux/mtd/rawnand.h> #include <linux/mtd/nand_ecc.h> #include <linux/platform_device.h> #include <linux/of.h> |