diff options
author | Boris Brezillon <boris.brezillon@free-electrons.com> | 2017-08-23 17:00:12 +0200 |
---|---|---|
committer | Boris Brezillon <boris.brezillon@free-electrons.com> | 2017-08-23 17:00:12 +0200 |
commit | a75d6a4cebcc58c4fb139385fc996a62b6f18f68 (patch) | |
tree | 86be6c413298b08e159d9f9019d52abd06540809 /arch/arm/mach-pxa/balloon3.c | |
parent | 311bba10cb0e232f2f9b0bace8bec873d7dc32a7 (diff) | |
parent | d4092d76a4a4e57b65910899948a83cc8646c5a5 (diff) | |
download | kernel_replicant_linux-a75d6a4cebcc58c4fb139385fc996a62b6f18f68.tar.gz kernel_replicant_linux-a75d6a4cebcc58c4fb139385fc996a62b6f18f68.tar.bz2 kernel_replicant_linux-a75d6a4cebcc58c4fb139385fc996a62b6f18f68.zip |
Merge branch 'nand/rename-header-file' of git://git.infradead.org/l2-mtd into nand/next
Diffstat (limited to 'arch/arm/mach-pxa/balloon3.c')
-rw-r--r-- | arch/arm/mach-pxa/balloon3.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-pxa/balloon3.c b/arch/arm/mach-pxa/balloon3.c index 1467c1d1e541..d6d92f388f14 100644 --- a/arch/arm/mach-pxa/balloon3.c +++ b/arch/arm/mach-pxa/balloon3.c @@ -29,7 +29,7 @@ #include <linux/types.h> #include <linux/platform_data/pcf857x.h> #include <linux/i2c/pxa-i2c.h> -#include <linux/mtd/nand.h> +#include <linux/mtd/rawnand.h> #include <linux/mtd/physmap.h> #include <linux/regulator/max1586.h> |