Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/798106/?format=api
{ "id": 798106, "url": "http://patchwork.ozlabs.org/api/patches/798106/?format=api", "web_url": "http://patchwork.ozlabs.org/project/linuxppc-dev/patch/1501860550-16506-2-git-send-email-boris.brezillon@free-electrons.com/", "project": { "id": 2, "url": "http://patchwork.ozlabs.org/api/projects/2/?format=api", "name": "Linux PPC development", "link_name": "linuxppc-dev", "list_id": "linuxppc-dev.lists.ozlabs.org", "list_email": "linuxppc-dev@lists.ozlabs.org", "web_url": "https://github.com/linuxppc/wiki/wiki", "scm_url": "https://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git", "webscm_url": "https://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git/", "list_archive_url": "https://lore.kernel.org/linuxppc-dev/", "list_archive_url_format": "https://lore.kernel.org/linuxppc-dev/{}/", "commit_url_format": "https://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git/commit/?id={}" }, "msgid": "<1501860550-16506-2-git-send-email-boris.brezillon@free-electrons.com>", "list_archive_url": "https://lore.kernel.org/linuxppc-dev/1501860550-16506-2-git-send-email-boris.brezillon@free-electrons.com/", "date": "2017-08-04T15:29:10", "name": "mtd: nand: Rename nand.h into rawnand.h", "commit_ref": null, "pull_url": null, "state": "not-applicable", "archived": false, "hash": "38f7ded68f8de96e2caaa24abb139b438e60e202", "submitter": { "id": 63120, "url": "http://patchwork.ozlabs.org/api/people/63120/?format=api", "name": "Boris Brezillon", "email": "boris.brezillon@free-electrons.com" }, "delegate": null, "mbox": "http://patchwork.ozlabs.org/project/linuxppc-dev/patch/1501860550-16506-2-git-send-email-boris.brezillon@free-electrons.com/mbox/", "series": [], "comments": "http://patchwork.ozlabs.org/api/patches/798106/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/798106/checks/", "tags": {}, "related": [], "headers": { "Return-Path": "<linuxppc-dev-bounces+patchwork-incoming=ozlabs.org@lists.ozlabs.org>", "X-Original-To": [ "patchwork-incoming@ozlabs.org", "linuxppc-dev@lists.ozlabs.org" ], "Delivered-To": [ "patchwork-incoming@ozlabs.org", "linuxppc-dev@lists.ozlabs.org" ], "Received": [ "from lists.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3])\n\t(using TLSv1.2 with cipher ADH-AES256-GCM-SHA384 (256/256 bits))\n\t(No client certificate requested)\n\tby ozlabs.org (Postfix) with ESMTPS id 3xPMw13Y6Fz9s7m\n\tfor <patchwork-incoming@ozlabs.org>;\n\tSat, 5 Aug 2017 09:05:21 +1000 (AEST)", "from lists.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3])\n\tby lists.ozlabs.org (Postfix) with ESMTP id 3xPMw12dcSzDqn9\n\tfor <patchwork-incoming@ozlabs.org>;\n\tSat, 5 Aug 2017 09:05:21 +1000 (AEST)", "from mail.free-electrons.com (mail.free-electrons.com [62.4.15.54])\n\tby lists.ozlabs.org (Postfix) with ESMTP id 3xP9zn1C73zDqJ7\n\tfor <linuxppc-dev@lists.ozlabs.org>;\n\tSat, 5 Aug 2017 01:37:56 +1000 (AEST)", "by mail.free-electrons.com (Postfix, from userid 110)\n\tid 9173921F05; Fri, 4 Aug 2017 17:29:17 +0200 (CEST)", "from localhost.localdomain\n\t(LStLambert-657-1-97-87.w90-63.abo.wanadoo.fr [90.63.216.87])\n\tby mail.free-electrons.com (Postfix) with ESMTPSA id 5434521EB6;\n\tFri, 4 Aug 2017 17:29:16 +0200 (CEST)" ], "X-Greylist": "delayed 515 seconds by postgrey-1.36 at bilbo;\n\tSat, 05 Aug 2017 01:37:57 AEST", "X-Spam-Checker-Version": "SpamAssassin 3.4.0 (2014-02-07) on\n\tmail.free-electrons.com", "X-Spam-Level": "", "X-Spam-Status": "No, score=-1.0 required=5.0 tests=ALL_TRUSTED,SHORTCIRCUIT\n\tshortcircuit=ham autolearn=disabled version=3.4.0", "From": "Boris Brezillon <boris.brezillon@free-electrons.com>", "To": "Boris Brezillon <boris.brezillon@free-electrons.com>,\n\tRichard Weinberger <richard@nod.at>, linux-mtd@lists.infradead.org", "Subject": "[PATCH] mtd: nand: Rename nand.h into rawnand.h", "Date": "Fri, 4 Aug 2017 17:29:10 +0200", "Message-Id": "<1501860550-16506-2-git-send-email-boris.brezillon@free-electrons.com>", "X-Mailer": "git-send-email 2.7.4", "In-Reply-To": "<1501860550-16506-1-git-send-email-boris.brezillon@free-electrons.com>", "References": "<1501860550-16506-1-git-send-email-boris.brezillon@free-electrons.com>", "MIME-Version": "1.0", "Content-Type": "text/plain; charset=UTF-8", "Content-Transfer-Encoding": "8bit", "X-Mailman-Approved-At": "Sat, 05 Aug 2017 09:02:59 +1000", "X-BeenThere": "linuxppc-dev@lists.ozlabs.org", "X-Mailman-Version": "2.1.23", "Precedence": "list", "List-Id": "Linux on PowerPC Developers Mail List\n\t<linuxppc-dev.lists.ozlabs.org>", "List-Unsubscribe": "<https://lists.ozlabs.org/options/linuxppc-dev>,\n\t<mailto:linuxppc-dev-request@lists.ozlabs.org?subject=unsubscribe>", "List-Archive": "<http://lists.ozlabs.org/pipermail/linuxppc-dev/>", "List-Post": "<mailto:linuxppc-dev@lists.ozlabs.org>", "List-Help": "<mailto:linuxppc-dev-request@lists.ozlabs.org?subject=help>", "List-Subscribe": "<https://lists.ozlabs.org/listinfo/linuxppc-dev>,\n\t<mailto:linuxppc-dev-request@lists.ozlabs.org?subject=subscribe>", "Cc": "Andrew Lunn <andrew@lunn.ch>, Rich Felker <dalias@libc.org>,\n\tNeil Armstrong <narmstrong@baylibre.com>,\n\tTony Lindgren <tony@atomide.com>, \n\tlinux-mips@linux-mips.org, Sekhar Nori <nsekhar@ti.com>,\n\tStefan Agner <stefan@agner.ch>,\n\tMasahiro Yamada <yamada.masahiro@socionext.com>,\n\tMarc Gonzalez <marc_gonzalez@sigmadesigns.com>,\n\tRobert Jarzmik <robert.jarzmik@free.fr>,\n\tAlexander Clouter <alex@digriz.org.uk>, devel@driverdev.osuosl.org,\n\tJesper Nilsson <jesper.nilsson@axis.com>, linux-omap@vger.kernel.org, \n\tMaxim Levitsky <maximlevitsky@gmail.com>,\n\tYoshinori Sato <ysato@users.sourceforge.jp>,\n\tJonathan Corbet <corbet@lwn.net>, \n\tlinux-sh@vger.kernel.org, Josh Wu <rainyfeeling@outlook.com>,\n\tlinux-doc@vger.kernel.org, linux-mediatek@lists.infradead.org,\n\tKrzysztof Kozlowski <krzk@kernel.org>,\n\tMarek Vasut <marek.vasut@gmail.com>, Kukjin Kim <kgene@kernel.org>,\n\tMatthias Brugger <matthias.bgg@gmail.com>, \n\tEzequiel Garcia <ezequiel.garcia@free-electrons.com>,\n\tSylvain Lemieux <slemieux.tyco@gmail.com>,\n\tbcm-kernel-feedback-list@broadcom.com,\n\tSebastian Hesselbarth <sebastian.hesselbarth@gmail.com>,\n\tlinuxppc-dev@lists.ozlabs.org, Jason Cooper <jason@lakedaemon.net>,\n\tWan ZongShun <mcuos.com@gmail.com>, Steven Miao <realmz6@gmail.com>, \n\tadi-buildroot-devel@lists.sourceforge.net,\n\tHaojian Zhuang <haojian.zhuang@gmail.com>,\n\tVladimir Zapolskiy <vz@mleia.com>, \n\tMikael Starvik <starvik@axis.com>, linux-oxnas@lists.tuxfamily.org,\n\tHarvey Hunt <harveyhuntnexus@gmail.com>,\n\tKrzysztof Halasa <khalasa@piap.pl>, Kamal Dasu <kdasu.kdev@gmail.com>,\n\tGregory Clement <gregory.clement@free-electrons.com>,\n\tHan Xu <han.xu@nxp.com>, Mauro Carvalho Chehab <mchehab@kernel.org>,\n\tAlexander Sverdlin <alexander.sverdlin@gmail.com>,\n\tSimtec Linux Team <linux@simtec.co.uk>,\n\tlinux-arm-kernel@lists.infradead.org, \n\tBrian Norris <computersforpeace@gmail.com>,\n\tEric Miao <eric.y.miao@gmail.com>, \n\tlinux-cris-kernel@axis.com, David Woodhouse <dwmw2@infradead.org>,\n\tKevin Hilman <khilman@kernel.org>,\n\tGreg Kroah-Hartman <gregkh@linuxfoundation.org>,\n\tRalf Baechle <ralf@linux-mips.org>, Wenyou Yang <wenyou.yang@atmel.com>, \n\tHartley Sweeten <hsweeten@visionengravers.com>,\n\tSascha Hauer <kernel@pengutronix.de>,\n\tCyrille Pitchen <cyrille.pitchen@wedev4u.fr>,\n\tFabio Estevam <fabio.estevam@nxp.com>,\n\tAaro Koskinen <aaro.koskinen@iki.fi>, \n\tlinux-samsung-soc@vger.kernel.org, Shawn Guo <shawnguo@kernel.org>,\n\tDaniel Mack <daniel@zonque.org>, Peter Pan <peterpandong@micron.com>", "Errors-To": "linuxppc-dev-bounces+patchwork-incoming=ozlabs.org@lists.ozlabs.org", "Sender": "\"Linuxppc-dev\"\n\t<linuxppc-dev-bounces+patchwork-incoming=ozlabs.org@lists.ozlabs.org>" }, "content": "We are planning to share more code between different NAND based\ndevices (SPI NAND, OneNAND and raw NANDs), but before doing that\nwe need to move the existing include/linux/mtd/nand.h file into\ninclude/linux/mtd/rawnand.h so we can later create a nand.h header\ncontaining all common structure and function prototypes.\n\nSigned-off-by: Boris Brezillon <boris.brezillon@free-electrons.com>\nSigned-off-by: Peter Pan <peterpandong@micron.com>\nCc: Jonathan Corbet <corbet@lwn.net>\nCc: Sekhar Nori <nsekhar@ti.com>\nCc: Kevin Hilman <khilman@kernel.org>\nCc: Jason Cooper <jason@lakedaemon.net>\nCc: Andrew Lunn <andrew@lunn.ch>\nCc: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>\nCc: Gregory Clement <gregory.clement@free-electrons.com>\nCc: Hartley Sweeten <hsweeten@visionengravers.com>\nCc: Alexander Sverdlin <alexander.sverdlin@gmail.com>\nCc: Shawn Guo <shawnguo@kernel.org>\nCc: Sascha Hauer <kernel@pengutronix.de>\nCc: Fabio Estevam <fabio.estevam@nxp.com>\nCc: Imre Kaloz <kaloz@openwrt.org>\nCc: Krzysztof Halasa <khalasa@piap.pl>\nCc: Eric Miao <eric.y.miao@gmail.com>\nCc: Haojian Zhuang <haojian.zhuang@gmail.com>\nCc: Aaro Koskinen <aaro.koskinen@iki.fi>\nCc: Tony Lindgren <tony@atomide.com>\nCc: Alexander Clouter <alex@digriz.org.uk>\nCc: Daniel Mack <daniel@zonque.org>\nCc: Robert Jarzmik <robert.jarzmik@free.fr>\nCc: Marek Vasut <marek.vasut@gmail.com>\nCc: Kukjin Kim <kgene@kernel.org>\nCc: Krzysztof Kozlowski <krzk@kernel.org>\nCc: Simtec Linux Team <linux@simtec.co.uk>\nCc: Steven Miao <realmz6@gmail.com>\nCc: Mikael Starvik <starvik@axis.com>\nCc: Jesper Nilsson <jesper.nilsson@axis.com>\nCc: Ralf Baechle <ralf@linux-mips.org>\nCc: Yoshinori Sato <ysato@users.sourceforge.jp>\nCc: Rich Felker <dalias@libc.org>\nCc: Wenyou Yang <wenyou.yang@atmel.com>\nCc: Josh Wu <rainyfeeling@outlook.com>\nCc: Kamal Dasu <kdasu.kdev@gmail.com>\nCc: Masahiro Yamada <yamada.masahiro@socionext.com>\nCc: Han Xu <han.xu@nxp.com>\nCc: Harvey Hunt <harveyhuntnexus@gmail.com>\nCc: Vladimir Zapolskiy <vz@mleia.com>\nCc: Sylvain Lemieux <slemieux.tyco@gmail.com>\nCc: Matthias Brugger <matthias.bgg@gmail.com>\nCc: Wan ZongShun <mcuos.com@gmail.com>\nCc: Neil Armstrong <narmstrong@baylibre.com>\nCc: Ezequiel Garcia <ezequiel.garcia@free-electrons.com>\nCc: Maxim Levitsky <maximlevitsky@gmail.com>\nCc: Marc Gonzalez <marc_gonzalez@sigmadesigns.com>\nCc: Stefan Agner <stefan@agner.ch>\nCc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>\nCc: Mauro Carvalho Chehab <mchehab@kernel.org>\nCc: linux-doc@vger.kernel.org\nCc: linux-arm-kernel@lists.infradead.org\nCc: linux-omap@vger.kernel.org\nCc: linux-samsung-soc@vger.kernel.org\nCc: adi-buildroot-devel@lists.sourceforge.net\nCc: linux-cris-kernel@axis.com\nCc: linux-mips@linux-mips.org\nCc: linux-sh@vger.kernel.org\nCc: bcm-kernel-feedback-list@broadcom.com\nCc: linux-mediatek@lists.infradead.org\nCc: linux-oxnas@lists.tuxfamily.org\nCc: linuxppc-dev@lists.ozlabs.org\nCc: devel@driverdev.osuosl.org\n---\nHi All,\n\nSorry for the huge Cc list, but I'd like to collect as much acks as\npossible for this patch which is actually part of a bigger series [1].\n\nNote that there's nothing complicated here, it's just a mechanical\ns/nand\\.h/rawnand\\.h/ replacement, but it impacts several architectures,\nthe doc and staging directories.\n\nRegards,\n\nBoris\n\n[1]https://lwn.net/Articles/723694/\n---\n Documentation/driver-api/mtdnand.rst | 8 ++++----\n MAINTAINERS | 2 +-\n arch/arm/mach-davinci/board-da850-evm.c | 2 +-\n arch/arm/mach-davinci/board-dm355-evm.c | 2 +-\n arch/arm/mach-davinci/board-dm355-leopard.c | 2 +-\n arch/arm/mach-davinci/board-dm365-evm.c | 2 +-\n arch/arm/mach-davinci/board-dm644x-evm.c | 2 +-\n arch/arm/mach-davinci/board-dm646x-evm.c | 2 +-\n arch/arm/mach-davinci/board-sffsdr.c | 2 +-\n arch/arm/mach-dove/dove-db-setup.c | 2 +-\n arch/arm/mach-ep93xx/snappercl15.c | 2 +-\n arch/arm/mach-ep93xx/ts72xx.c | 2 +-\n arch/arm/mach-imx/mach-qong.c | 2 +-\n arch/arm/mach-ixp4xx/ixdp425-setup.c | 2 +-\n arch/arm/mach-mmp/aspenite.c | 2 +-\n arch/arm/mach-omap1/board-fsample.c | 2 +-\n arch/arm/mach-omap1/board-h2.c | 2 +-\n arch/arm/mach-omap1/board-h3.c | 2 +-\n arch/arm/mach-omap1/board-nand.c | 2 +-\n arch/arm/mach-omap1/board-perseus2.c | 2 +-\n arch/arm/mach-orion5x/db88f5281-setup.c | 2 +-\n arch/arm/mach-orion5x/kurobox_pro-setup.c | 2 +-\n arch/arm/mach-orion5x/ts209-setup.c | 2 +-\n arch/arm/mach-orion5x/ts78xx-setup.c | 2 +-\n arch/arm/mach-pxa/balloon3.c | 2 +-\n arch/arm/mach-pxa/em-x270.c | 2 +-\n arch/arm/mach-pxa/eseries.c | 2 +-\n arch/arm/mach-pxa/palmtx.c | 2 +-\n arch/arm/mach-pxa/tosa.c | 2 +-\n arch/arm/mach-s3c24xx/common-smdk.c | 2 +-\n arch/arm/mach-s3c24xx/mach-anubis.c | 2 +-\n arch/arm/mach-s3c24xx/mach-at2440evb.c | 2 +-\n arch/arm/mach-s3c24xx/mach-bast.c | 2 +-\n arch/arm/mach-s3c24xx/mach-gta02.c | 2 +-\n arch/arm/mach-s3c24xx/mach-jive.c | 2 +-\n arch/arm/mach-s3c24xx/mach-mini2440.c | 2 +-\n arch/arm/mach-s3c24xx/mach-osiris.c | 2 +-\n arch/arm/mach-s3c24xx/mach-qt2410.c | 2 +-\n arch/arm/mach-s3c24xx/mach-rx3715.c | 2 +-\n arch/arm/mach-s3c24xx/mach-vstms.c | 2 +-\n arch/blackfin/mach-bf537/boards/dnp5370.c | 2 +-\n arch/blackfin/mach-bf537/boards/stamp.c | 2 +-\n arch/blackfin/mach-bf561/boards/acvilon.c | 2 +-\n arch/cris/arch-v32/drivers/mach-a3/nandflash.c | 2 +-\n arch/cris/arch-v32/drivers/mach-fs/nandflash.c | 2 +-\n arch/mips/alchemy/devboards/db1200.c | 2 +-\n arch/mips/alchemy/devboards/db1300.c | 2 +-\n arch/mips/alchemy/devboards/db1550.c | 2 +-\n arch/mips/include/asm/mach-jz4740/jz4740_nand.h | 2 +-\n arch/mips/netlogic/xlr/platform-flash.c | 2 +-\n arch/mips/pnx833x/common/platform.c | 2 +-\n arch/mips/rb532/devices.c | 2 +-\n arch/sh/boards/mach-migor/setup.c | 2 +-\n drivers/mtd/inftlcore.c | 2 +-\n drivers/mtd/nand/ams-delta.c | 2 +-\n drivers/mtd/nand/atmel/nand-controller.c | 2 +-\n drivers/mtd/nand/atmel/pmecc.c | 2 +-\n drivers/mtd/nand/au1550nd.c | 2 +-\n drivers/mtd/nand/bcm47xxnflash/bcm47xxnflash.h | 2 +-\n drivers/mtd/nand/bf5xx_nand.c | 2 +-\n drivers/mtd/nand/brcmnand/brcmnand.c | 2 +-\n drivers/mtd/nand/cafe_nand.c | 2 +-\n drivers/mtd/nand/cmx270_nand.c | 2 +-\n drivers/mtd/nand/cs553x_nand.c | 2 +-\n drivers/mtd/nand/davinci_nand.c | 2 +-\n drivers/mtd/nand/denali.h | 2 +-\n drivers/mtd/nand/diskonchip.c | 2 +-\n drivers/mtd/nand/docg4.c | 2 +-\n drivers/mtd/nand/fsl_elbc_nand.c | 2 +-\n drivers/mtd/nand/fsl_ifc_nand.c | 2 +-\n drivers/mtd/nand/fsl_upm.c | 2 +-\n drivers/mtd/nand/fsmc_nand.c | 2 +-\n drivers/mtd/nand/gpio.c | 2 +-\n drivers/mtd/nand/gpmi-nand/gpmi-nand.h | 2 +-\n drivers/mtd/nand/hisi504_nand.c | 2 +-\n drivers/mtd/nand/jz4740_nand.c | 2 +-\n drivers/mtd/nand/jz4780_nand.c | 2 +-\n drivers/mtd/nand/lpc32xx_mlc.c | 2 +-\n drivers/mtd/nand/lpc32xx_slc.c | 2 +-\n drivers/mtd/nand/mpc5121_nfc.c | 2 +-\n drivers/mtd/nand/mtk_nand.c | 2 +-\n drivers/mtd/nand/mxc_nand.c | 2 +-\n drivers/mtd/nand/nand_amd.c | 2 +-\n drivers/mtd/nand/nand_base.c | 2 +-\n drivers/mtd/nand/nand_bbt.c | 2 +-\n drivers/mtd/nand/nand_bch.c | 2 +-\n drivers/mtd/nand/nand_ecc.c | 2 +-\n drivers/mtd/nand/nand_hynix.c | 2 +-\n drivers/mtd/nand/nand_ids.c | 2 +-\n drivers/mtd/nand/nand_macronix.c | 2 +-\n drivers/mtd/nand/nand_micron.c | 2 +-\n drivers/mtd/nand/nand_samsung.c | 2 +-\n drivers/mtd/nand/nand_timings.c | 2 +-\n drivers/mtd/nand/nand_toshiba.c | 2 +-\n drivers/mtd/nand/nandsim.c | 2 +-\n drivers/mtd/nand/ndfc.c | 2 +-\n drivers/mtd/nand/nuc900_nand.c | 2 +-\n drivers/mtd/nand/omap2.c | 2 +-\n drivers/mtd/nand/orion_nand.c | 2 +-\n drivers/mtd/nand/oxnas_nand.c | 2 +-\n drivers/mtd/nand/pasemi_nand.c | 2 +-\n drivers/mtd/nand/plat_nand.c | 2 +-\n drivers/mtd/nand/pxa3xx_nand.c | 2 +-\n drivers/mtd/nand/qcom_nandc.c | 2 +-\n drivers/mtd/nand/r852.h | 2 +-\n drivers/mtd/nand/s3c2410.c | 2 +-\n drivers/mtd/nand/sh_flctl.c | 2 +-\n drivers/mtd/nand/sharpsl.c | 2 +-\n drivers/mtd/nand/sm_common.c | 2 +-\n drivers/mtd/nand/socrates_nand.c | 2 +-\n drivers/mtd/nand/sunxi_nand.c | 2 +-\n drivers/mtd/nand/tango_nand.c | 2 +-\n drivers/mtd/nand/tmio_nand.c | 2 +-\n drivers/mtd/nand/txx9ndfmc.c | 2 +-\n drivers/mtd/nand/vf610_nfc.c | 2 +-\n drivers/mtd/nand/xway_nand.c | 2 +-\n drivers/mtd/nftlcore.c | 2 +-\n drivers/mtd/nftlmount.c | 2 +-\n drivers/mtd/ssfdc.c | 2 +-\n drivers/mtd/tests/nandbiterrs.c | 2 +-\n drivers/staging/mt29f_spinand/mt29f_spinand.c | 2 +-\n fs/jffs2/wbuf.c | 2 +-\n include/linux/mtd/nand-gpio.h | 2 +-\n include/linux/mtd/{nand.h => rawnand.h} | 8 +++-----\n include/linux/mtd/sh_flctl.h | 2 +-\n include/linux/mtd/sharpsl.h | 2 +-\n include/linux/platform_data/mtd-davinci.h | 2 +-\n include/linux/platform_data/mtd-nand-s3c2410.h | 2 +-\n 128 files changed, 133 insertions(+), 135 deletions(-)\n rename include/linux/mtd/{nand.h => rawnand.h} (99%)", "diff": "diff --git a/Documentation/driver-api/mtdnand.rst b/Documentation/driver-api/mtdnand.rst\nindex e9afa586d15e..2a5191b6d445 100644\n--- a/Documentation/driver-api/mtdnand.rst\n+++ b/Documentation/driver-api/mtdnand.rst\n@@ -516,7 +516,7 @@ mirrored table is performed.\n \n The most important field in the nand_bbt_descr structure is the\n options field. The options define most of the table properties. Use the\n-predefined constants from nand.h to define the options.\n+predefined constants from rawnand.h to define the options.\n \n - Number of bits per block\n \n@@ -843,7 +843,7 @@ Chip option constants\n Constants for chip id table\n ~~~~~~~~~~~~~~~~~~~~~~~~~~~\n \n-These constants are defined in nand.h. They are OR-ed together to\n+These constants are defined in rawnand.h. They are OR-ed together to\n describe the chip functionality::\n \n /* Buswitdh is 16 bit */\n@@ -865,7 +865,7 @@ describe the chip functionality::\n Constants for runtime options\n ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~\n \n-These constants are defined in nand.h. They are OR-ed together to\n+These constants are defined in rawnand.h. They are OR-ed together to\n describe the functionality::\n \n /* The hw ecc generator provides a syndrome instead a ecc value on read\n@@ -956,7 +956,7 @@ developer. Each struct member has a short description which is marked\n with an [XXX] identifier. See the chapter \"Documentation hints\" for an\n explanation.\n \n-.. kernel-doc:: include/linux/mtd/nand.h\n+.. kernel-doc:: include/linux/mtd/rawnand.h\n :internal:\n \n Public Functions Provided\ndiff --git a/MAINTAINERS b/MAINTAINERS\nindex 205d3977ac46..bffb38373550 100644\n--- a/MAINTAINERS\n+++ b/MAINTAINERS\n@@ -9034,7 +9034,7 @@ T:\tgit git://git.infradead.org/linux-mtd.git nand/fixes\n T:\tgit git://git.infradead.org/l2-mtd.git nand/next\n S:\tMaintained\n F:\tdrivers/mtd/nand/\n-F:\tinclude/linux/mtd/nand*.h\n+F:\tinclude/linux/mtd/*nand*.h\n \n NATSEMI ETHERNET DRIVER (DP8381x)\n S:\tOrphan\ndiff --git a/arch/arm/mach-davinci/board-da850-evm.c b/arch/arm/mach-davinci/board-da850-evm.c\nindex b5625d009288..f54410388194 100644\n--- a/arch/arm/mach-davinci/board-da850-evm.c\n+++ b/arch/arm/mach-davinci/board-da850-evm.c\n@@ -26,7 +26,7 @@\n #include <linux/input/tps6507x-ts.h>\n #include <linux/mfd/tps6507x.h>\n #include <linux/mtd/mtd.h>\n-#include <linux/mtd/nand.h>\n+#include <linux/mtd/rawnand.h>\n #include <linux/mtd/partitions.h>\n #include <linux/mtd/physmap.h>\n #include <linux/platform_device.h>\ndiff --git a/arch/arm/mach-davinci/board-dm355-evm.c b/arch/arm/mach-davinci/board-dm355-evm.c\nindex 18296a99c4d2..62e7bc3018f0 100644\n--- a/arch/arm/mach-davinci/board-dm355-evm.c\n+++ b/arch/arm/mach-davinci/board-dm355-evm.c\n@@ -14,7 +14,7 @@\n #include <linux/platform_device.h>\n #include <linux/mtd/mtd.h>\n #include <linux/mtd/partitions.h>\n-#include <linux/mtd/nand.h>\n+#include <linux/mtd/rawnand.h>\n #include <linux/i2c.h>\n #include <linux/gpio.h>\n #include <linux/clk.h>\ndiff --git a/arch/arm/mach-davinci/board-dm355-leopard.c b/arch/arm/mach-davinci/board-dm355-leopard.c\nindex 284ff27c1b32..be997243447b 100644\n--- a/arch/arm/mach-davinci/board-dm355-leopard.c\n+++ b/arch/arm/mach-davinci/board-dm355-leopard.c\n@@ -13,7 +13,7 @@\n #include <linux/platform_device.h>\n #include <linux/mtd/mtd.h>\n #include <linux/mtd/partitions.h>\n-#include <linux/mtd/nand.h>\n+#include <linux/mtd/rawnand.h>\n #include <linux/i2c.h>\n #include <linux/gpio.h>\n #include <linux/clk.h>\ndiff --git a/arch/arm/mach-davinci/board-dm365-evm.c b/arch/arm/mach-davinci/board-dm365-evm.c\nindex 0464999b7137..e75741fb2c1d 100644\n--- a/arch/arm/mach-davinci/board-dm365-evm.c\n+++ b/arch/arm/mach-davinci/board-dm365-evm.c\n@@ -23,7 +23,7 @@\n #include <linux/mtd/mtd.h>\n #include <linux/mtd/partitions.h>\n #include <linux/slab.h>\n-#include <linux/mtd/nand.h>\n+#include <linux/mtd/rawnand.h>\n #include <linux/input.h>\n #include <linux/spi/spi.h>\n #include <linux/spi/eeprom.h>\ndiff --git a/arch/arm/mach-davinci/board-dm644x-evm.c b/arch/arm/mach-davinci/board-dm644x-evm.c\nindex 70e00dbeec96..b07c9b18d427 100644\n--- a/arch/arm/mach-davinci/board-dm644x-evm.c\n+++ b/arch/arm/mach-davinci/board-dm644x-evm.c\n@@ -17,7 +17,7 @@\n #include <linux/platform_data/pcf857x.h>\n #include <linux/platform_data/at24.h>\n #include <linux/mtd/mtd.h>\n-#include <linux/mtd/nand.h>\n+#include <linux/mtd/rawnand.h>\n #include <linux/mtd/partitions.h>\n #include <linux/mtd/physmap.h>\n #include <linux/phy.h>\ndiff --git a/arch/arm/mach-davinci/board-dm646x-evm.c b/arch/arm/mach-davinci/board-dm646x-evm.c\nindex 1d76e7480a42..cb0a41e83582 100644\n--- a/arch/arm/mach-davinci/board-dm646x-evm.c\n+++ b/arch/arm/mach-davinci/board-dm646x-evm.c\n@@ -29,7 +29,7 @@\n #include <media/i2c/adv7343.h>\n \n #include <linux/mtd/mtd.h>\n-#include <linux/mtd/nand.h>\n+#include <linux/mtd/rawnand.h>\n #include <linux/mtd/partitions.h>\n #include <linux/clk.h>\n #include <linux/export.h>\ndiff --git a/arch/arm/mach-davinci/board-sffsdr.c b/arch/arm/mach-davinci/board-sffsdr.c\nindex 41c7c9615791..d85accf7f760 100644\n--- a/arch/arm/mach-davinci/board-sffsdr.c\n+++ b/arch/arm/mach-davinci/board-sffsdr.c\n@@ -28,7 +28,7 @@\n #include <linux/i2c.h>\n #include <linux/platform_data/at24.h>\n #include <linux/mtd/mtd.h>\n-#include <linux/mtd/nand.h>\n+#include <linux/mtd/rawnand.h>\n #include <linux/mtd/partitions.h>\n \n #include <asm/mach-types.h>\ndiff --git a/arch/arm/mach-dove/dove-db-setup.c b/arch/arm/mach-dove/dove-db-setup.c\nindex bcb678fd2415..8971c3c0f0fe 100644\n--- a/arch/arm/mach-dove/dove-db-setup.c\n+++ b/arch/arm/mach-dove/dove-db-setup.c\n@@ -13,7 +13,7 @@\n #include <linux/platform_device.h>\n #include <linux/irq.h>\n #include <linux/mtd/physmap.h>\n-#include <linux/mtd/nand.h>\n+#include <linux/mtd/rawnand.h>\n #include <linux/timer.h>\n #include <linux/ata_platform.h>\n #include <linux/mv643xx_eth.h>\ndiff --git a/arch/arm/mach-ep93xx/snappercl15.c b/arch/arm/mach-ep93xx/snappercl15.c\nindex b2db791b3b38..8b29398f4dc7 100644\n--- a/arch/arm/mach-ep93xx/snappercl15.c\n+++ b/arch/arm/mach-ep93xx/snappercl15.c\n@@ -25,7 +25,7 @@\n #include <linux/fb.h>\n \n #include <linux/mtd/partitions.h>\n-#include <linux/mtd/nand.h>\n+#include <linux/mtd/rawnand.h>\n \n #include <mach/hardware.h>\n #include <linux/platform_data/video-ep93xx.h>\ndiff --git a/arch/arm/mach-ep93xx/ts72xx.c b/arch/arm/mach-ep93xx/ts72xx.c\nindex 55b186ef863a..8745162ec05d 100644\n--- a/arch/arm/mach-ep93xx/ts72xx.c\n+++ b/arch/arm/mach-ep93xx/ts72xx.c\n@@ -16,7 +16,7 @@\n #include <linux/init.h>\n #include <linux/platform_device.h>\n #include <linux/io.h>\n-#include <linux/mtd/nand.h>\n+#include <linux/mtd/rawnand.h>\n #include <linux/mtd/partitions.h>\n \n #include <mach/hardware.h>\ndiff --git a/arch/arm/mach-imx/mach-qong.c b/arch/arm/mach-imx/mach-qong.c\nindex 8c2cbd693d21..42a700053103 100644\n--- a/arch/arm/mach-imx/mach-qong.c\n+++ b/arch/arm/mach-imx/mach-qong.c\n@@ -18,7 +18,7 @@\n #include <linux/memory.h>\n #include <linux/platform_device.h>\n #include <linux/mtd/physmap.h>\n-#include <linux/mtd/nand.h>\n+#include <linux/mtd/rawnand.h>\n #include <linux/gpio.h>\n \n #include <asm/mach-types.h>\ndiff --git a/arch/arm/mach-ixp4xx/ixdp425-setup.c b/arch/arm/mach-ixp4xx/ixdp425-setup.c\nindex 508c2d7786e2..93b89291c06b 100644\n--- a/arch/arm/mach-ixp4xx/ixdp425-setup.c\n+++ b/arch/arm/mach-ixp4xx/ixdp425-setup.c\n@@ -17,7 +17,7 @@\n #include <linux/i2c-gpio.h>\n #include <linux/io.h>\n #include <linux/mtd/mtd.h>\n-#include <linux/mtd/nand.h>\n+#include <linux/mtd/rawnand.h>\n #include <linux/mtd/partitions.h>\n #include <linux/delay.h>\n #include <linux/gpio.h>\ndiff --git a/arch/arm/mach-mmp/aspenite.c b/arch/arm/mach-mmp/aspenite.c\nindex 5db0edf716dd..d2283009a5ff 100644\n--- a/arch/arm/mach-mmp/aspenite.c\n+++ b/arch/arm/mach-mmp/aspenite.c\n@@ -16,7 +16,7 @@\n #include <linux/smc91x.h>\n #include <linux/mtd/mtd.h>\n #include <linux/mtd/partitions.h>\n-#include <linux/mtd/nand.h>\n+#include <linux/mtd/rawnand.h>\n #include <linux/interrupt.h>\n #include <linux/platform_data/mv_usb.h>\n \ndiff --git a/arch/arm/mach-omap1/board-fsample.c b/arch/arm/mach-omap1/board-fsample.c\nindex fad95b74bb65..b93ad58b0a63 100644\n--- a/arch/arm/mach-omap1/board-fsample.c\n+++ b/arch/arm/mach-omap1/board-fsample.c\n@@ -16,7 +16,7 @@\n #include <linux/platform_device.h>\n #include <linux/delay.h>\n #include <linux/mtd/mtd.h>\n-#include <linux/mtd/nand.h>\n+#include <linux/mtd/rawnand.h>\n #include <linux/mtd/partitions.h>\n #include <linux/mtd/physmap.h>\n #include <linux/input.h>\ndiff --git a/arch/arm/mach-omap1/board-h2.c b/arch/arm/mach-omap1/board-h2.c\nindex 675254ee4b1e..a444b139bff5 100644\n--- a/arch/arm/mach-omap1/board-h2.c\n+++ b/arch/arm/mach-omap1/board-h2.c\n@@ -24,7 +24,7 @@\n #include <linux/delay.h>\n #include <linux/i2c.h>\n #include <linux/mtd/mtd.h>\n-#include <linux/mtd/nand.h>\n+#include <linux/mtd/rawnand.h>\n #include <linux/mtd/partitions.h>\n #include <linux/mtd/physmap.h>\n #include <linux/input.h>\ndiff --git a/arch/arm/mach-omap1/board-h3.c b/arch/arm/mach-omap1/board-h3.c\nindex e62f9d454f10..a618a49a30b8 100644\n--- a/arch/arm/mach-omap1/board-h3.c\n+++ b/arch/arm/mach-omap1/board-h3.c\n@@ -23,7 +23,7 @@\n #include <linux/workqueue.h>\n #include <linux/i2c.h>\n #include <linux/mtd/mtd.h>\n-#include <linux/mtd/nand.h>\n+#include <linux/mtd/rawnand.h>\n #include <linux/mtd/partitions.h>\n #include <linux/mtd/physmap.h>\n #include <linux/input.h>\ndiff --git a/arch/arm/mach-omap1/board-nand.c b/arch/arm/mach-omap1/board-nand.c\nindex 7684f9203474..1bffbb4e050f 100644\n--- a/arch/arm/mach-omap1/board-nand.c\n+++ b/arch/arm/mach-omap1/board-nand.c\n@@ -16,7 +16,7 @@\n #include <linux/kernel.h>\n #include <linux/io.h>\n #include <linux/mtd/mtd.h>\n-#include <linux/mtd/nand.h>\n+#include <linux/mtd/rawnand.h>\n \n #include \"common.h\"\n \ndiff --git a/arch/arm/mach-omap1/board-perseus2.c b/arch/arm/mach-omap1/board-perseus2.c\nindex 150b57ba42bf..e994a78bdd09 100644\n--- a/arch/arm/mach-omap1/board-perseus2.c\n+++ b/arch/arm/mach-omap1/board-perseus2.c\n@@ -16,7 +16,7 @@\n #include <linux/platform_device.h>\n #include <linux/delay.h>\n #include <linux/mtd/mtd.h>\n-#include <linux/mtd/nand.h>\n+#include <linux/mtd/rawnand.h>\n #include <linux/mtd/partitions.h>\n #include <linux/mtd/physmap.h>\n #include <linux/input.h>\ndiff --git a/arch/arm/mach-orion5x/db88f5281-setup.c b/arch/arm/mach-orion5x/db88f5281-setup.c\nindex 12f74b46e2ff..3f5863de766a 100644\n--- a/arch/arm/mach-orion5x/db88f5281-setup.c\n+++ b/arch/arm/mach-orion5x/db88f5281-setup.c\n@@ -16,7 +16,7 @@\n #include <linux/pci.h>\n #include <linux/irq.h>\n #include <linux/mtd/physmap.h>\n-#include <linux/mtd/nand.h>\n+#include <linux/mtd/rawnand.h>\n #include <linux/timer.h>\n #include <linux/mv643xx_eth.h>\n #include <linux/i2c.h>\ndiff --git a/arch/arm/mach-orion5x/kurobox_pro-setup.c b/arch/arm/mach-orion5x/kurobox_pro-setup.c\nindex 9dc3f59bed9c..83d43cff4bd7 100644\n--- a/arch/arm/mach-orion5x/kurobox_pro-setup.c\n+++ b/arch/arm/mach-orion5x/kurobox_pro-setup.c\n@@ -15,7 +15,7 @@\n #include <linux/irq.h>\n #include <linux/delay.h>\n #include <linux/mtd/physmap.h>\n-#include <linux/mtd/nand.h>\n+#include <linux/mtd/rawnand.h>\n #include <linux/mv643xx_eth.h>\n #include <linux/i2c.h>\n #include <linux/serial_reg.h>\ndiff --git a/arch/arm/mach-orion5x/ts209-setup.c b/arch/arm/mach-orion5x/ts209-setup.c\nindex 7bd671b2854c..0c315515dd2d 100644\n--- a/arch/arm/mach-orion5x/ts209-setup.c\n+++ b/arch/arm/mach-orion5x/ts209-setup.c\n@@ -15,7 +15,7 @@\n #include <linux/pci.h>\n #include <linux/irq.h>\n #include <linux/mtd/physmap.h>\n-#include <linux/mtd/nand.h>\n+#include <linux/mtd/rawnand.h>\n #include <linux/mv643xx_eth.h>\n #include <linux/gpio_keys.h>\n #include <linux/input.h>\ndiff --git a/arch/arm/mach-orion5x/ts78xx-setup.c b/arch/arm/mach-orion5x/ts78xx-setup.c\nindex 7ef80a8304c0..94778739e38f 100644\n--- a/arch/arm/mach-orion5x/ts78xx-setup.c\n+++ b/arch/arm/mach-orion5x/ts78xx-setup.c\n@@ -16,7 +16,7 @@\n #include <linux/platform_device.h>\n #include <linux/mv643xx_eth.h>\n #include <linux/ata_platform.h>\n-#include <linux/mtd/nand.h>\n+#include <linux/mtd/rawnand.h>\n #include <linux/mtd/partitions.h>\n #include <linux/timeriomem-rng.h>\n #include <asm/mach-types.h>\ndiff --git a/arch/arm/mach-pxa/balloon3.c b/arch/arm/mach-pxa/balloon3.c\nindex 1467c1d1e541..d6d92f388f14 100644\n--- a/arch/arm/mach-pxa/balloon3.c\n+++ b/arch/arm/mach-pxa/balloon3.c\n@@ -29,7 +29,7 @@\n #include <linux/types.h>\n #include <linux/platform_data/pcf857x.h>\n #include <linux/i2c/pxa-i2c.h>\n-#include <linux/mtd/nand.h>\n+#include <linux/mtd/rawnand.h>\n #include <linux/mtd/physmap.h>\n #include <linux/regulator/max1586.h>\n \ndiff --git a/arch/arm/mach-pxa/em-x270.c b/arch/arm/mach-pxa/em-x270.c\nindex 811a7317f3ea..6d28035ebba5 100644\n--- a/arch/arm/mach-pxa/em-x270.c\n+++ b/arch/arm/mach-pxa/em-x270.c\n@@ -15,7 +15,7 @@\n \n #include <linux/dm9000.h>\n #include <linux/platform_data/rtc-v3020.h>\n-#include <linux/mtd/nand.h>\n+#include <linux/mtd/rawnand.h>\n #include <linux/mtd/partitions.h>\n #include <linux/mtd/physmap.h>\n #include <linux/input.h>\ndiff --git a/arch/arm/mach-pxa/eseries.c b/arch/arm/mach-pxa/eseries.c\nindex fa9d71d194f0..91f7c3e40065 100644\n--- a/arch/arm/mach-pxa/eseries.c\n+++ b/arch/arm/mach-pxa/eseries.c\n@@ -20,7 +20,7 @@\n #include <linux/mfd/tc6387xb.h>\n #include <linux/mfd/tc6393xb.h>\n #include <linux/mfd/t7l66xb.h>\n-#include <linux/mtd/nand.h>\n+#include <linux/mtd/rawnand.h>\n #include <linux/mtd/partitions.h>\n #include <linux/usb/gpio_vbus.h>\n #include <linux/memblock.h>\ndiff --git a/arch/arm/mach-pxa/palmtx.c b/arch/arm/mach-pxa/palmtx.c\nindex 36646975b5d2..47e3e38e9bec 100644\n--- a/arch/arm/mach-pxa/palmtx.c\n+++ b/arch/arm/mach-pxa/palmtx.c\n@@ -28,7 +28,7 @@\n #include <linux/wm97xx.h>\n #include <linux/power_supply.h>\n #include <linux/usb/gpio_vbus.h>\n-#include <linux/mtd/nand.h>\n+#include <linux/mtd/rawnand.h>\n #include <linux/mtd/partitions.h>\n #include <linux/mtd/mtd.h>\n #include <linux/mtd/physmap.h>\ndiff --git a/arch/arm/mach-pxa/tosa.c b/arch/arm/mach-pxa/tosa.c\nindex 13de6602966f..6a386fd6363e 100644\n--- a/arch/arm/mach-pxa/tosa.c\n+++ b/arch/arm/mach-pxa/tosa.c\n@@ -24,7 +24,7 @@\n #include <linux/mmc/host.h>\n #include <linux/mfd/tc6393xb.h>\n #include <linux/mfd/tmio.h>\n-#include <linux/mtd/nand.h>\n+#include <linux/mtd/rawnand.h>\n #include <linux/mtd/partitions.h>\n #include <linux/mtd/physmap.h>\n #include <linux/pm.h>\ndiff --git a/arch/arm/mach-s3c24xx/common-smdk.c b/arch/arm/mach-s3c24xx/common-smdk.c\nindex 9e0bc46e90ec..0e116c92bf01 100644\n--- a/arch/arm/mach-s3c24xx/common-smdk.c\n+++ b/arch/arm/mach-s3c24xx/common-smdk.c\n@@ -23,7 +23,7 @@\n #include <linux/platform_device.h>\n \n #include <linux/mtd/mtd.h>\n-#include <linux/mtd/nand.h>\n+#include <linux/mtd/rawnand.h>\n #include <linux/mtd/nand_ecc.h>\n #include <linux/mtd/partitions.h>\n #include <linux/io.h>\ndiff --git a/arch/arm/mach-s3c24xx/mach-anubis.c b/arch/arm/mach-s3c24xx/mach-anubis.c\nindex 029ef1b58925..c14cab361922 100644\n--- a/arch/arm/mach-s3c24xx/mach-anubis.c\n+++ b/arch/arm/mach-s3c24xx/mach-anubis.c\n@@ -40,7 +40,7 @@\n #include <linux/platform_data/i2c-s3c2410.h>\n \n #include <linux/mtd/mtd.h>\n-#include <linux/mtd/nand.h>\n+#include <linux/mtd/rawnand.h>\n #include <linux/mtd/nand_ecc.h>\n #include <linux/mtd/partitions.h>\n \ndiff --git a/arch/arm/mach-s3c24xx/mach-at2440evb.c b/arch/arm/mach-s3c24xx/mach-at2440evb.c\nindex 7b28eb623fc1..ebdbafb9382a 100644\n--- a/arch/arm/mach-s3c24xx/mach-at2440evb.c\n+++ b/arch/arm/mach-s3c24xx/mach-at2440evb.c\n@@ -41,7 +41,7 @@\n #include <linux/platform_data/i2c-s3c2410.h>\n \n #include <linux/mtd/mtd.h>\n-#include <linux/mtd/nand.h>\n+#include <linux/mtd/rawnand.h>\n #include <linux/mtd/nand_ecc.h>\n #include <linux/mtd/partitions.h>\n \ndiff --git a/arch/arm/mach-s3c24xx/mach-bast.c b/arch/arm/mach-s3c24xx/mach-bast.c\nindex 5185036765db..704dc84b3480 100644\n--- a/arch/arm/mach-s3c24xx/mach-bast.c\n+++ b/arch/arm/mach-s3c24xx/mach-bast.c\n@@ -28,7 +28,7 @@\n #include <linux/serial_8250.h>\n \n #include <linux/mtd/mtd.h>\n-#include <linux/mtd/nand.h>\n+#include <linux/mtd/rawnand.h>\n #include <linux/mtd/nand_ecc.h>\n #include <linux/mtd/partitions.h>\n \ndiff --git a/arch/arm/mach-s3c24xx/mach-gta02.c b/arch/arm/mach-s3c24xx/mach-gta02.c\nindex b0ed401da3a3..afe18baf0c84 100644\n--- a/arch/arm/mach-s3c24xx/mach-gta02.c\n+++ b/arch/arm/mach-s3c24xx/mach-gta02.c\n@@ -50,7 +50,7 @@\n #include <linux/mfd/pcf50633/pmic.h>\n \n #include <linux/mtd/mtd.h>\n-#include <linux/mtd/nand.h>\n+#include <linux/mtd/rawnand.h>\n #include <linux/mtd/nand_ecc.h>\n #include <linux/mtd/partitions.h>\n #include <linux/mtd/physmap.h>\ndiff --git a/arch/arm/mach-s3c24xx/mach-jive.c b/arch/arm/mach-s3c24xx/mach-jive.c\nindex f5b5c49b56ac..17821976f769 100644\n--- a/arch/arm/mach-s3c24xx/mach-jive.c\n+++ b/arch/arm/mach-s3c24xx/mach-jive.c\n@@ -43,7 +43,7 @@\n #include <asm/mach-types.h>\n \n #include <linux/mtd/mtd.h>\n-#include <linux/mtd/nand.h>\n+#include <linux/mtd/rawnand.h>\n #include <linux/mtd/nand_ecc.h>\n #include <linux/mtd/partitions.h>\n \ndiff --git a/arch/arm/mach-s3c24xx/mach-mini2440.c b/arch/arm/mach-s3c24xx/mach-mini2440.c\nindex 71af8d2fd320..15140d34f927 100644\n--- a/arch/arm/mach-s3c24xx/mach-mini2440.c\n+++ b/arch/arm/mach-s3c24xx/mach-mini2440.c\n@@ -49,7 +49,7 @@\n #include <linux/platform_data/usb-s3c2410_udc.h>\n \n #include <linux/mtd/mtd.h>\n-#include <linux/mtd/nand.h>\n+#include <linux/mtd/rawnand.h>\n #include <linux/mtd/nand_ecc.h>\n #include <linux/mtd/partitions.h>\n \ndiff --git a/arch/arm/mach-s3c24xx/mach-osiris.c b/arch/arm/mach-s3c24xx/mach-osiris.c\nindex 70b0eb7d3134..a6657e720430 100644\n--- a/arch/arm/mach-s3c24xx/mach-osiris.c\n+++ b/arch/arm/mach-s3c24xx/mach-osiris.c\n@@ -36,7 +36,7 @@\n #include <linux/platform_data/i2c-s3c2410.h>\n \n #include <linux/mtd/mtd.h>\n-#include <linux/mtd/nand.h>\n+#include <linux/mtd/rawnand.h>\n #include <linux/mtd/nand_ecc.h>\n #include <linux/mtd/partitions.h>\n \ndiff --git a/arch/arm/mach-s3c24xx/mach-qt2410.c b/arch/arm/mach-s3c24xx/mach-qt2410.c\nindex 868c82087403..84e3a9c53184 100644\n--- a/arch/arm/mach-s3c24xx/mach-qt2410.c\n+++ b/arch/arm/mach-s3c24xx/mach-qt2410.c\n@@ -36,7 +36,7 @@\n #include <linux/spi/spi_gpio.h>\n #include <linux/io.h>\n #include <linux/mtd/mtd.h>\n-#include <linux/mtd/nand.h>\n+#include <linux/mtd/rawnand.h>\n #include <linux/mtd/nand_ecc.h>\n #include <linux/mtd/partitions.h>\n \ndiff --git a/arch/arm/mach-s3c24xx/mach-rx3715.c b/arch/arm/mach-s3c24xx/mach-rx3715.c\nindex a39fb9780dd3..b5ba615cf9dd 100644\n--- a/arch/arm/mach-s3c24xx/mach-rx3715.c\n+++ b/arch/arm/mach-s3c24xx/mach-rx3715.c\n@@ -27,7 +27,7 @@\n #include <linux/serial.h>\n #include <linux/io.h>\n #include <linux/mtd/mtd.h>\n-#include <linux/mtd/nand.h>\n+#include <linux/mtd/rawnand.h>\n #include <linux/mtd/nand_ecc.h>\n #include <linux/mtd/partitions.h>\n \ndiff --git a/arch/arm/mach-s3c24xx/mach-vstms.c b/arch/arm/mach-s3c24xx/mach-vstms.c\nindex f5e6322145fa..1adc957edf0f 100644\n--- a/arch/arm/mach-s3c24xx/mach-vstms.c\n+++ b/arch/arm/mach-s3c24xx/mach-vstms.c\n@@ -20,7 +20,7 @@\n #include <linux/platform_device.h>\n #include <linux/io.h>\n #include <linux/mtd/mtd.h>\n-#include <linux/mtd/nand.h>\n+#include <linux/mtd/rawnand.h>\n #include <linux/mtd/nand_ecc.h>\n #include <linux/mtd/partitions.h>\n #include <linux/memblock.h>\ndiff --git a/arch/blackfin/mach-bf537/boards/dnp5370.c b/arch/blackfin/mach-bf537/boards/dnp5370.c\nindex e79b3b810c39..c4a8ffb15417 100644\n--- a/arch/blackfin/mach-bf537/boards/dnp5370.c\n+++ b/arch/blackfin/mach-bf537/boards/dnp5370.c\n@@ -17,7 +17,7 @@\n #include <linux/platform_device.h>\n #include <linux/io.h>\n #include <linux/mtd/mtd.h>\n-#include <linux/mtd/nand.h>\n+#include <linux/mtd/rawnand.h>\n #include <linux/mtd/partitions.h>\n #include <linux/mtd/plat-ram.h>\n #include <linux/mtd/physmap.h>\ndiff --git a/arch/blackfin/mach-bf537/boards/stamp.c b/arch/blackfin/mach-bf537/boards/stamp.c\nindex 7528148dc492..400e6693643e 100644\n--- a/arch/blackfin/mach-bf537/boards/stamp.c\n+++ b/arch/blackfin/mach-bf537/boards/stamp.c\n@@ -12,7 +12,7 @@\n #include <linux/platform_device.h>\n #include <linux/io.h>\n #include <linux/mtd/mtd.h>\n-#include <linux/mtd/nand.h>\n+#include <linux/mtd/rawnand.h>\n #include <linux/mtd/partitions.h>\n #include <linux/mtd/plat-ram.h>\n #include <linux/mtd/physmap.h>\ndiff --git a/arch/blackfin/mach-bf561/boards/acvilon.c b/arch/blackfin/mach-bf561/boards/acvilon.c\nindex 37f8f25a1347..696cc9d7820a 100644\n--- a/arch/blackfin/mach-bf561/boards/acvilon.c\n+++ b/arch/blackfin/mach-bf561/boards/acvilon.c\n@@ -38,7 +38,7 @@\n #include <linux/mtd/mtd.h>\n #include <linux/mtd/partitions.h>\n #include <linux/mtd/physmap.h>\n-#include <linux/mtd/nand.h>\n+#include <linux/mtd/rawnand.h>\n #include <linux/mtd/plat-ram.h>\n #include <linux/spi/spi.h>\n #include <linux/spi/flash.h>\ndiff --git a/arch/cris/arch-v32/drivers/mach-a3/nandflash.c b/arch/cris/arch-v32/drivers/mach-a3/nandflash.c\nindex 3f646c787e58..925a98eb6d68 100644\n--- a/arch/cris/arch-v32/drivers/mach-a3/nandflash.c\n+++ b/arch/cris/arch-v32/drivers/mach-a3/nandflash.c\n@@ -16,7 +16,7 @@\n #include <linux/init.h>\n #include <linux/module.h>\n #include <linux/mtd/mtd.h>\n-#include <linux/mtd/nand.h>\n+#include <linux/mtd/rawnand.h>\n #include <linux/mtd/partitions.h>\n #include <arch/memmap.h>\n #include <hwregs/reg_map.h>\ndiff --git a/arch/cris/arch-v32/drivers/mach-fs/nandflash.c b/arch/cris/arch-v32/drivers/mach-fs/nandflash.c\nindex a74540514bdb..53b56a429dde 100644\n--- a/arch/cris/arch-v32/drivers/mach-fs/nandflash.c\n+++ b/arch/cris/arch-v32/drivers/mach-fs/nandflash.c\n@@ -16,7 +16,7 @@\n #include <linux/init.h>\n #include <linux/module.h>\n #include <linux/mtd/mtd.h>\n-#include <linux/mtd/nand.h>\n+#include <linux/mtd/rawnand.h>\n #include <linux/mtd/partitions.h>\n #include <arch/memmap.h>\n #include <hwregs/reg_map.h>\ndiff --git a/arch/mips/alchemy/devboards/db1200.c b/arch/mips/alchemy/devboards/db1200.c\nindex 992442a03d8b..83831002c832 100644\n--- a/arch/mips/alchemy/devboards/db1200.c\n+++ b/arch/mips/alchemy/devboards/db1200.c\n@@ -29,7 +29,7 @@\n #include <linux/leds.h>\n #include <linux/mmc/host.h>\n #include <linux/mtd/mtd.h>\n-#include <linux/mtd/nand.h>\n+#include <linux/mtd/rawnand.h>\n #include <linux/mtd/partitions.h>\n #include <linux/platform_device.h>\n #include <linux/serial_8250.h>\ndiff --git a/arch/mips/alchemy/devboards/db1300.c b/arch/mips/alchemy/devboards/db1300.c\nindex a5504f57cb00..3e7fbdbdb3c4 100644\n--- a/arch/mips/alchemy/devboards/db1300.c\n+++ b/arch/mips/alchemy/devboards/db1300.c\n@@ -18,7 +18,7 @@\n #include <linux/mmc/host.h>\n #include <linux/module.h>\n #include <linux/mtd/mtd.h>\n-#include <linux/mtd/nand.h>\n+#include <linux/mtd/rawnand.h>\n #include <linux/mtd/partitions.h>\n #include <linux/platform_device.h>\n #include <linux/smsc911x.h>\ndiff --git a/arch/mips/alchemy/devboards/db1550.c b/arch/mips/alchemy/devboards/db1550.c\nindex 1c01d6eadb08..421bd5793f7e 100644\n--- a/arch/mips/alchemy/devboards/db1550.c\n+++ b/arch/mips/alchemy/devboards/db1550.c\n@@ -12,7 +12,7 @@\n #include <linux/io.h>\n #include <linux/interrupt.h>\n #include <linux/mtd/mtd.h>\n-#include <linux/mtd/nand.h>\n+#include <linux/mtd/rawnand.h>\n #include <linux/mtd/partitions.h>\n #include <linux/platform_device.h>\n #include <linux/pm.h>\ndiff --git a/arch/mips/include/asm/mach-jz4740/jz4740_nand.h b/arch/mips/include/asm/mach-jz4740/jz4740_nand.h\nindex 7f7b0fc554da..f381d465e768 100644\n--- a/arch/mips/include/asm/mach-jz4740/jz4740_nand.h\n+++ b/arch/mips/include/asm/mach-jz4740/jz4740_nand.h\n@@ -16,7 +16,7 @@\n #ifndef __ASM_MACH_JZ4740_JZ4740_NAND_H__\n #define __ASM_MACH_JZ4740_JZ4740_NAND_H__\n \n-#include <linux/mtd/nand.h>\n+#include <linux/mtd/rawnand.h>\n #include <linux/mtd/partitions.h>\n \n #define JZ_NAND_NUM_BANKS 4\ndiff --git a/arch/mips/netlogic/xlr/platform-flash.c b/arch/mips/netlogic/xlr/platform-flash.c\nindex f03131fec41d..4d1b4c003376 100644\n--- a/arch/mips/netlogic/xlr/platform-flash.c\n+++ b/arch/mips/netlogic/xlr/platform-flash.c\n@@ -19,7 +19,7 @@\n \n #include <linux/mtd/mtd.h>\n #include <linux/mtd/physmap.h>\n-#include <linux/mtd/nand.h>\n+#include <linux/mtd/rawnand.h>\n #include <linux/mtd/partitions.h>\n \n #include <asm/netlogic/haldefs.h>\ndiff --git a/arch/mips/pnx833x/common/platform.c b/arch/mips/pnx833x/common/platform.c\nindex 7cf4eb50fc72..a7a4e9f5146d 100644\n--- a/arch/mips/pnx833x/common/platform.c\n+++ b/arch/mips/pnx833x/common/platform.c\n@@ -30,7 +30,7 @@\n #include <linux/resource.h>\n #include <linux/serial.h>\n #include <linux/serial_pnx8xxx.h>\n-#include <linux/mtd/nand.h>\n+#include <linux/mtd/rawnand.h>\n #include <linux/mtd/partitions.h>\n \n #include <irq.h>\ndiff --git a/arch/mips/rb532/devices.c b/arch/mips/rb532/devices.c\nindex 0966adccf520..32ea3e6731d6 100644\n--- a/arch/mips/rb532/devices.c\n+++ b/arch/mips/rb532/devices.c\n@@ -20,7 +20,7 @@\n #include <linux/ctype.h>\n #include <linux/string.h>\n #include <linux/platform_device.h>\n-#include <linux/mtd/nand.h>\n+#include <linux/mtd/rawnand.h>\n #include <linux/mtd/mtd.h>\n #include <linux/mtd/partitions.h>\n #include <linux/gpio.h>\ndiff --git a/arch/sh/boards/mach-migor/setup.c b/arch/sh/boards/mach-migor/setup.c\nindex 5de60a77eaa1..0bcbe58b11e9 100644\n--- a/arch/sh/boards/mach-migor/setup.c\n+++ b/arch/sh/boards/mach-migor/setup.c\n@@ -15,7 +15,7 @@\n #include <linux/mmc/host.h>\n #include <linux/mtd/physmap.h>\n #include <linux/mfd/tmio.h>\n-#include <linux/mtd/nand.h>\n+#include <linux/mtd/rawnand.h>\n #include <linux/i2c.h>\n #include <linux/regulator/fixed.h>\n #include <linux/regulator/machine.h>\ndiff --git a/drivers/mtd/inftlcore.c b/drivers/mtd/inftlcore.c\nindex 8db740d6eb08..57ef1fb42a04 100644\n--- a/drivers/mtd/inftlcore.c\n+++ b/drivers/mtd/inftlcore.c\n@@ -33,7 +33,7 @@\n #include <linux/mtd/mtd.h>\n #include <linux/mtd/nftl.h>\n #include <linux/mtd/inftl.h>\n-#include <linux/mtd/nand.h>\n+#include <linux/mtd/rawnand.h>\n #include <linux/uaccess.h>\n #include <asm/errno.h>\n #include <asm/io.h>\ndiff --git a/drivers/mtd/nand/ams-delta.c b/drivers/mtd/nand/ams-delta.c\nindex 5d6c26f3cf7f..dcec9cf4983f 100644\n--- a/drivers/mtd/nand/ams-delta.c\n+++ b/drivers/mtd/nand/ams-delta.c\n@@ -20,7 +20,7 @@\n #include <linux/module.h>\n #include <linux/delay.h>\n #include <linux/mtd/mtd.h>\n-#include <linux/mtd/nand.h>\n+#include <linux/mtd/rawnand.h>\n #include <linux/mtd/partitions.h>\n #include <linux/gpio.h>\n #include <linux/platform_data/gpio-omap.h>\ndiff --git a/drivers/mtd/nand/atmel/nand-controller.c b/drivers/mtd/nand/atmel/nand-controller.c\nindex d922a88e407f..6606270b9b9b 100644\n--- a/drivers/mtd/nand/atmel/nand-controller.c\n+++ b/drivers/mtd/nand/atmel/nand-controller.c\n@@ -59,7 +59,7 @@\n #include <linux/mfd/syscon/atmel-matrix.h>\n #include <linux/mfd/syscon/atmel-smc.h>\n #include <linux/module.h>\n-#include <linux/mtd/nand.h>\n+#include <linux/mtd/rawnand.h>\n #include <linux/of_address.h>\n #include <linux/of_irq.h>\n #include <linux/of_platform.h>\ndiff --git a/drivers/mtd/nand/atmel/pmecc.c b/drivers/mtd/nand/atmel/pmecc.c\nindex 55a8ee5306ea..27a969a8f105 100644\n--- a/drivers/mtd/nand/atmel/pmecc.c\n+++ b/drivers/mtd/nand/atmel/pmecc.c\n@@ -47,7 +47,7 @@\n #include <linux/genalloc.h>\n #include <linux/iopoll.h>\n #include <linux/module.h>\n-#include <linux/mtd/nand.h>\n+#include <linux/mtd/rawnand.h>\n #include <linux/of_irq.h>\n #include <linux/of_platform.h>\n #include <linux/platform_device.h>\ndiff --git a/drivers/mtd/nand/au1550nd.c b/drivers/mtd/nand/au1550nd.c\nindex 9bf6d9915694..9d4a28fa6b73 100644\n--- a/drivers/mtd/nand/au1550nd.c\n+++ b/drivers/mtd/nand/au1550nd.c\n@@ -14,7 +14,7 @@\n #include <linux/module.h>\n #include <linux/interrupt.h>\n #include <linux/mtd/mtd.h>\n-#include <linux/mtd/nand.h>\n+#include <linux/mtd/rawnand.h>\n #include <linux/mtd/partitions.h>\n #include <linux/platform_device.h>\n #include <asm/io.h>\ndiff --git a/drivers/mtd/nand/bcm47xxnflash/bcm47xxnflash.h b/drivers/mtd/nand/bcm47xxnflash/bcm47xxnflash.h\nindex 8ea75710a854..c8834767ab6d 100644\n--- a/drivers/mtd/nand/bcm47xxnflash/bcm47xxnflash.h\n+++ b/drivers/mtd/nand/bcm47xxnflash/bcm47xxnflash.h\n@@ -6,7 +6,7 @@\n #endif\n \n #include <linux/mtd/mtd.h>\n-#include <linux/mtd/nand.h>\n+#include <linux/mtd/rawnand.h>\n \n struct bcm47xxnflash {\n \tstruct bcma_drv_cc *cc;\ndiff --git a/drivers/mtd/nand/bf5xx_nand.c b/drivers/mtd/nand/bf5xx_nand.c\nindex 3962f55bd034..5655dca6ce43 100644\n--- a/drivers/mtd/nand/bf5xx_nand.c\n+++ b/drivers/mtd/nand/bf5xx_nand.c\n@@ -49,7 +49,7 @@\n #include <linux/bitops.h>\n \n #include <linux/mtd/mtd.h>\n-#include <linux/mtd/nand.h>\n+#include <linux/mtd/rawnand.h>\n #include <linux/mtd/nand_ecc.h>\n #include <linux/mtd/partitions.h>\n \ndiff --git a/drivers/mtd/nand/brcmnand/brcmnand.c b/drivers/mtd/nand/brcmnand/brcmnand.c\nindex 7419c5ce63f8..e0eb51d8c012 100644\n--- a/drivers/mtd/nand/brcmnand/brcmnand.c\n+++ b/drivers/mtd/nand/brcmnand/brcmnand.c\n@@ -29,7 +29,7 @@\n #include <linux/bitops.h>\n #include <linux/mm.h>\n #include <linux/mtd/mtd.h>\n-#include <linux/mtd/nand.h>\n+#include <linux/mtd/rawnand.h>\n #include <linux/mtd/partitions.h>\n #include <linux/of.h>\n #include <linux/of_platform.h>\ndiff --git a/drivers/mtd/nand/cafe_nand.c b/drivers/mtd/nand/cafe_nand.c\nindex 2fd733eba0a3..bc558c438a57 100644\n--- a/drivers/mtd/nand/cafe_nand.c\n+++ b/drivers/mtd/nand/cafe_nand.c\n@@ -13,7 +13,7 @@\n #include <linux/device.h>\n #undef DEBUG\n #include <linux/mtd/mtd.h>\n-#include <linux/mtd/nand.h>\n+#include <linux/mtd/rawnand.h>\n #include <linux/mtd/partitions.h>\n #include <linux/rslib.h>\n #include <linux/pci.h>\ndiff --git a/drivers/mtd/nand/cmx270_nand.c b/drivers/mtd/nand/cmx270_nand.c\nindex 949b9400dcb7..1fc435f994e1 100644\n--- a/drivers/mtd/nand/cmx270_nand.c\n+++ b/drivers/mtd/nand/cmx270_nand.c\n@@ -18,7 +18,7 @@\n * CM-X270 board.\n */\n \n-#include <linux/mtd/nand.h>\n+#include <linux/mtd/rawnand.h>\n #include <linux/mtd/partitions.h>\n #include <linux/slab.h>\n #include <linux/gpio.h>\ndiff --git a/drivers/mtd/nand/cs553x_nand.c b/drivers/mtd/nand/cs553x_nand.c\nindex 594b28684138..d48877540f14 100644\n--- a/drivers/mtd/nand/cs553x_nand.c\n+++ b/drivers/mtd/nand/cs553x_nand.c\n@@ -24,7 +24,7 @@\n #include <linux/module.h>\n #include <linux/delay.h>\n #include <linux/mtd/mtd.h>\n-#include <linux/mtd/nand.h>\n+#include <linux/mtd/rawnand.h>\n #include <linux/mtd/nand_ecc.h>\n #include <linux/mtd/partitions.h>\n \ndiff --git a/drivers/mtd/nand/davinci_nand.c b/drivers/mtd/nand/davinci_nand.c\nindex 7b26e53b95b1..ccc8c43abcff 100644\n--- a/drivers/mtd/nand/davinci_nand.c\n+++ b/drivers/mtd/nand/davinci_nand.c\n@@ -29,7 +29,7 @@\n #include <linux/err.h>\n #include <linux/clk.h>\n #include <linux/io.h>\n-#include <linux/mtd/nand.h>\n+#include <linux/mtd/rawnand.h>\n #include <linux/mtd/partitions.h>\n #include <linux/slab.h>\n #include <linux/of_device.h>\ndiff --git a/drivers/mtd/nand/denali.h b/drivers/mtd/nand/denali.h\nindex 237cc706b0fb..9239e6793e6e 100644\n--- a/drivers/mtd/nand/denali.h\n+++ b/drivers/mtd/nand/denali.h\n@@ -21,7 +21,7 @@\n #define __DENALI_H__\n \n #include <linux/bitops.h>\n-#include <linux/mtd/nand.h>\n+#include <linux/mtd/rawnand.h>\n \n #define DEVICE_RESET\t\t\t\t0x0\n #define DEVICE_RESET__BANK(bank)\t\t\tBIT(bank)\ndiff --git a/drivers/mtd/nand/diskonchip.c b/drivers/mtd/nand/diskonchip.c\nindex a023ab9e9cbf..c3aa53caab5c 100644\n--- a/drivers/mtd/nand/diskonchip.c\n+++ b/drivers/mtd/nand/diskonchip.c\n@@ -27,7 +27,7 @@\n #include <linux/io.h>\n \n #include <linux/mtd/mtd.h>\n-#include <linux/mtd/nand.h>\n+#include <linux/mtd/rawnand.h>\n #include <linux/mtd/doc2000.h>\n #include <linux/mtd/partitions.h>\n #include <linux/mtd/inftl.h>\ndiff --git a/drivers/mtd/nand/docg4.c b/drivers/mtd/nand/docg4.c\nindex a27a84fbfb84..2436cbc71662 100644\n--- a/drivers/mtd/nand/docg4.c\n+++ b/drivers/mtd/nand/docg4.c\n@@ -41,7 +41,7 @@\n #include <linux/bitops.h>\n #include <linux/mtd/partitions.h>\n #include <linux/mtd/mtd.h>\n-#include <linux/mtd/nand.h>\n+#include <linux/mtd/rawnand.h>\n #include <linux/bch.h>\n #include <linux/bitrev.h>\n #include <linux/jiffies.h>\ndiff --git a/drivers/mtd/nand/fsl_elbc_nand.c b/drivers/mtd/nand/fsl_elbc_nand.c\nindex b9ac16f05057..17db2f90aa2c 100644\n--- a/drivers/mtd/nand/fsl_elbc_nand.c\n+++ b/drivers/mtd/nand/fsl_elbc_nand.c\n@@ -34,7 +34,7 @@\n #include <linux/interrupt.h>\n \n #include <linux/mtd/mtd.h>\n-#include <linux/mtd/nand.h>\n+#include <linux/mtd/rawnand.h>\n #include <linux/mtd/nand_ecc.h>\n #include <linux/mtd/partitions.h>\n \ndiff --git a/drivers/mtd/nand/fsl_ifc_nand.c b/drivers/mtd/nand/fsl_ifc_nand.c\nindex 59408ec2c69f..9e03bac7f34c 100644\n--- a/drivers/mtd/nand/fsl_ifc_nand.c\n+++ b/drivers/mtd/nand/fsl_ifc_nand.c\n@@ -26,7 +26,7 @@\n #include <linux/of_address.h>\n #include <linux/slab.h>\n #include <linux/mtd/mtd.h>\n-#include <linux/mtd/nand.h>\n+#include <linux/mtd/rawnand.h>\n #include <linux/mtd/partitions.h>\n #include <linux/mtd/nand_ecc.h>\n #include <linux/fsl_ifc.h>\ndiff --git a/drivers/mtd/nand/fsl_upm.c b/drivers/mtd/nand/fsl_upm.c\nindex d85fa2555b68..a88e2cf66e0f 100644\n--- a/drivers/mtd/nand/fsl_upm.c\n+++ b/drivers/mtd/nand/fsl_upm.c\n@@ -14,7 +14,7 @@\n #include <linux/kernel.h>\n #include <linux/module.h>\n #include <linux/delay.h>\n-#include <linux/mtd/nand.h>\n+#include <linux/mtd/rawnand.h>\n #include <linux/mtd/nand_ecc.h>\n #include <linux/mtd/partitions.h>\n #include <linux/mtd/mtd.h>\ndiff --git a/drivers/mtd/nand/fsmc_nand.c b/drivers/mtd/nand/fsmc_nand.c\nindex 9d8b051d3187..eac15d9bf49e 100644\n--- a/drivers/mtd/nand/fsmc_nand.c\n+++ b/drivers/mtd/nand/fsmc_nand.c\n@@ -28,7 +28,7 @@\n #include <linux/sched.h>\n #include <linux/types.h>\n #include <linux/mtd/mtd.h>\n-#include <linux/mtd/nand.h>\n+#include <linux/mtd/rawnand.h>\n #include <linux/mtd/nand_ecc.h>\n #include <linux/platform_device.h>\n #include <linux/of.h>\ndiff --git a/drivers/mtd/nand/gpio.c b/drivers/mtd/nand/gpio.c\nindex 85294f150f4f..fd3648952b5a 100644\n--- a/drivers/mtd/nand/gpio.c\n+++ b/drivers/mtd/nand/gpio.c\n@@ -26,7 +26,7 @@\n #include <linux/gpio.h>\n #include <linux/io.h>\n #include <linux/mtd/mtd.h>\n-#include <linux/mtd/nand.h>\n+#include <linux/mtd/rawnand.h>\n #include <linux/mtd/partitions.h>\n #include <linux/mtd/nand-gpio.h>\n #include <linux/of.h>\ndiff --git a/drivers/mtd/nand/gpmi-nand/gpmi-nand.h b/drivers/mtd/nand/gpmi-nand/gpmi-nand.h\nindex 9df0ad64e7e0..a45e4ce13d10 100644\n--- a/drivers/mtd/nand/gpmi-nand/gpmi-nand.h\n+++ b/drivers/mtd/nand/gpmi-nand/gpmi-nand.h\n@@ -17,7 +17,7 @@\n #ifndef __DRIVERS_MTD_NAND_GPMI_NAND_H\n #define __DRIVERS_MTD_NAND_GPMI_NAND_H\n \n-#include <linux/mtd/nand.h>\n+#include <linux/mtd/rawnand.h>\n #include <linux/platform_device.h>\n #include <linux/dma-mapping.h>\n #include <linux/dmaengine.h>\ndiff --git a/drivers/mtd/nand/hisi504_nand.c b/drivers/mtd/nand/hisi504_nand.c\nindex 530caa80b1b6..d9ee1a7e6956 100644\n--- a/drivers/mtd/nand/hisi504_nand.c\n+++ b/drivers/mtd/nand/hisi504_nand.c\n@@ -26,7 +26,7 @@\n #include <linux/module.h>\n #include <linux/delay.h>\n #include <linux/interrupt.h>\n-#include <linux/mtd/nand.h>\n+#include <linux/mtd/rawnand.h>\n #include <linux/dma-mapping.h>\n #include <linux/platform_device.h>\n #include <linux/mtd/partitions.h>\ndiff --git a/drivers/mtd/nand/jz4740_nand.c b/drivers/mtd/nand/jz4740_nand.c\nindex 0d06a1f07d82..ad827d4af3e9 100644\n--- a/drivers/mtd/nand/jz4740_nand.c\n+++ b/drivers/mtd/nand/jz4740_nand.c\n@@ -20,7 +20,7 @@\n #include <linux/slab.h>\n \n #include <linux/mtd/mtd.h>\n-#include <linux/mtd/nand.h>\n+#include <linux/mtd/rawnand.h>\n #include <linux/mtd/partitions.h>\n \n #include <linux/gpio.h>\ndiff --git a/drivers/mtd/nand/jz4780_nand.c b/drivers/mtd/nand/jz4780_nand.c\nindex 8bc835f71b26..e69f6ae4c539 100644\n--- a/drivers/mtd/nand/jz4780_nand.c\n+++ b/drivers/mtd/nand/jz4780_nand.c\n@@ -20,7 +20,7 @@\n #include <linux/platform_device.h>\n #include <linux/slab.h>\n #include <linux/mtd/mtd.h>\n-#include <linux/mtd/nand.h>\n+#include <linux/mtd/rawnand.h>\n #include <linux/mtd/partitions.h>\n \n #include <linux/jz4780-nemc.h>\ndiff --git a/drivers/mtd/nand/lpc32xx_mlc.c b/drivers/mtd/nand/lpc32xx_mlc.c\nindex 91ee369681f0..c3bb358ef01e 100644\n--- a/drivers/mtd/nand/lpc32xx_mlc.c\n+++ b/drivers/mtd/nand/lpc32xx_mlc.c\n@@ -27,7 +27,7 @@\n #include <linux/module.h>\n #include <linux/platform_device.h>\n #include <linux/mtd/mtd.h>\n-#include <linux/mtd/nand.h>\n+#include <linux/mtd/rawnand.h>\n #include <linux/mtd/partitions.h>\n #include <linux/clk.h>\n #include <linux/err.h>\ndiff --git a/drivers/mtd/nand/lpc32xx_slc.c b/drivers/mtd/nand/lpc32xx_slc.c\nindex 80c282914586..b61f28a1554d 100644\n--- a/drivers/mtd/nand/lpc32xx_slc.c\n+++ b/drivers/mtd/nand/lpc32xx_slc.c\n@@ -23,7 +23,7 @@\n #include <linux/module.h>\n #include <linux/platform_device.h>\n #include <linux/mtd/mtd.h>\n-#include <linux/mtd/nand.h>\n+#include <linux/mtd/rawnand.h>\n #include <linux/mtd/partitions.h>\n #include <linux/clk.h>\n #include <linux/err.h>\ndiff --git a/drivers/mtd/nand/mpc5121_nfc.c b/drivers/mtd/nand/mpc5121_nfc.c\nindex 0e86fb6277c3..b6b97cc9fba6 100644\n--- a/drivers/mtd/nand/mpc5121_nfc.c\n+++ b/drivers/mtd/nand/mpc5121_nfc.c\n@@ -33,7 +33,7 @@\n #include <linux/interrupt.h>\n #include <linux/io.h>\n #include <linux/mtd/mtd.h>\n-#include <linux/mtd/nand.h>\n+#include <linux/mtd/rawnand.h>\n #include <linux/mtd/partitions.h>\n #include <linux/of_address.h>\n #include <linux/of_device.h>\ndiff --git a/drivers/mtd/nand/mtk_nand.c b/drivers/mtd/nand/mtk_nand.c\nindex f7ae99464375..d86a7d131cc0 100644\n--- a/drivers/mtd/nand/mtk_nand.c\n+++ b/drivers/mtd/nand/mtk_nand.c\n@@ -19,7 +19,7 @@\n #include <linux/interrupt.h>\n #include <linux/delay.h>\n #include <linux/clk.h>\n-#include <linux/mtd/nand.h>\n+#include <linux/mtd/rawnand.h>\n #include <linux/mtd/mtd.h>\n #include <linux/module.h>\n #include <linux/iopoll.h>\ndiff --git a/drivers/mtd/nand/mxc_nand.c b/drivers/mtd/nand/mxc_nand.c\nindex 5bedf7bc3d88..53e5e0337c3e 100644\n--- a/drivers/mtd/nand/mxc_nand.c\n+++ b/drivers/mtd/nand/mxc_nand.c\n@@ -22,7 +22,7 @@\n #include <linux/init.h>\n #include <linux/module.h>\n #include <linux/mtd/mtd.h>\n-#include <linux/mtd/nand.h>\n+#include <linux/mtd/rawnand.h>\n #include <linux/mtd/partitions.h>\n #include <linux/interrupt.h>\n #include <linux/device.h>\ndiff --git a/drivers/mtd/nand/nand_amd.c b/drivers/mtd/nand/nand_amd.c\nindex 170403a3bfa8..22f060f38123 100644\n--- a/drivers/mtd/nand/nand_amd.c\n+++ b/drivers/mtd/nand/nand_amd.c\n@@ -15,7 +15,7 @@\n * GNU General Public License for more details.\n */\n \n-#include <linux/mtd/nand.h>\n+#include <linux/mtd/rawnand.h>\n \n static void amd_nand_decode_id(struct nand_chip *chip)\n {\ndiff --git a/drivers/mtd/nand/nand_base.c b/drivers/mtd/nand/nand_base.c\nindex 331b93cf4e6c..4f85b4817bc4 100644\n--- a/drivers/mtd/nand/nand_base.c\n+++ b/drivers/mtd/nand/nand_base.c\n@@ -39,7 +39,7 @@\n #include <linux/nmi.h>\n #include <linux/types.h>\n #include <linux/mtd/mtd.h>\n-#include <linux/mtd/nand.h>\n+#include <linux/mtd/rawnand.h>\n #include <linux/mtd/nand_ecc.h>\n #include <linux/mtd/nand_bch.h>\n #include <linux/interrupt.h>\ndiff --git a/drivers/mtd/nand/nand_bbt.c b/drivers/mtd/nand/nand_bbt.c\nindex 7695efea65f2..2915b6739bf8 100644\n--- a/drivers/mtd/nand/nand_bbt.c\n+++ b/drivers/mtd/nand/nand_bbt.c\n@@ -61,7 +61,7 @@\n #include <linux/types.h>\n #include <linux/mtd/mtd.h>\n #include <linux/mtd/bbm.h>\n-#include <linux/mtd/nand.h>\n+#include <linux/mtd/rawnand.h>\n #include <linux/bitops.h>\n #include <linux/delay.h>\n #include <linux/vmalloc.h>\ndiff --git a/drivers/mtd/nand/nand_bch.c b/drivers/mtd/nand/nand_bch.c\nindex 44763f87eae4..505441c9373b 100644\n--- a/drivers/mtd/nand/nand_bch.c\n+++ b/drivers/mtd/nand/nand_bch.c\n@@ -25,7 +25,7 @@\n #include <linux/slab.h>\n #include <linux/bitops.h>\n #include <linux/mtd/mtd.h>\n-#include <linux/mtd/nand.h>\n+#include <linux/mtd/rawnand.h>\n #include <linux/mtd/nand_bch.h>\n #include <linux/bch.h>\n \ndiff --git a/drivers/mtd/nand/nand_ecc.c b/drivers/mtd/nand/nand_ecc.c\nindex d1770b066396..7613a0388044 100644\n--- a/drivers/mtd/nand/nand_ecc.c\n+++ b/drivers/mtd/nand/nand_ecc.c\n@@ -43,7 +43,7 @@\n #include <linux/kernel.h>\n #include <linux/module.h>\n #include <linux/mtd/mtd.h>\n-#include <linux/mtd/nand.h>\n+#include <linux/mtd/rawnand.h>\n #include <linux/mtd/nand_ecc.h>\n #include <asm/byteorder.h>\n #else\ndiff --git a/drivers/mtd/nand/nand_hynix.c b/drivers/mtd/nand/nand_hynix.c\nindex b12dc7325378..b735cc8ec104 100644\n--- a/drivers/mtd/nand/nand_hynix.c\n+++ b/drivers/mtd/nand/nand_hynix.c\n@@ -15,7 +15,7 @@\n * GNU General Public License for more details.\n */\n \n-#include <linux/mtd/nand.h>\n+#include <linux/mtd/rawnand.h>\n #include <linux/sizes.h>\n #include <linux/slab.h>\n \ndiff --git a/drivers/mtd/nand/nand_ids.c b/drivers/mtd/nand/nand_ids.c\nindex 92e2cf8e9ff9..5423c3bb388e 100644\n--- a/drivers/mtd/nand/nand_ids.c\n+++ b/drivers/mtd/nand/nand_ids.c\n@@ -6,7 +6,7 @@\n * published by the Free Software Foundation.\n *\n */\n-#include <linux/mtd/nand.h>\n+#include <linux/mtd/rawnand.h>\n #include <linux/sizes.h>\n \n #define LP_OPTIONS 0\ndiff --git a/drivers/mtd/nand/nand_macronix.c b/drivers/mtd/nand/nand_macronix.c\nindex 84855c3e1a02..d290ff2a6d2f 100644\n--- a/drivers/mtd/nand/nand_macronix.c\n+++ b/drivers/mtd/nand/nand_macronix.c\n@@ -15,7 +15,7 @@\n * GNU General Public License for more details.\n */\n \n-#include <linux/mtd/nand.h>\n+#include <linux/mtd/rawnand.h>\n \n static int macronix_nand_init(struct nand_chip *chip)\n {\ndiff --git a/drivers/mtd/nand/nand_micron.c b/drivers/mtd/nand/nand_micron.c\nindex c30ab60f8e1b..abf6a3c376e8 100644\n--- a/drivers/mtd/nand/nand_micron.c\n+++ b/drivers/mtd/nand/nand_micron.c\n@@ -15,7 +15,7 @@\n * GNU General Public License for more details.\n */\n \n-#include <linux/mtd/nand.h>\n+#include <linux/mtd/rawnand.h>\n \n /*\n * Special Micron status bit that indicates when the block has been\ndiff --git a/drivers/mtd/nand/nand_samsung.c b/drivers/mtd/nand/nand_samsung.c\nindex 1e0755997762..d348f0129ae7 100644\n--- a/drivers/mtd/nand/nand_samsung.c\n+++ b/drivers/mtd/nand/nand_samsung.c\n@@ -15,7 +15,7 @@\n * GNU General Public License for more details.\n */\n \n-#include <linux/mtd/nand.h>\n+#include <linux/mtd/rawnand.h>\n \n static void samsung_nand_decode_id(struct nand_chip *chip)\n {\ndiff --git a/drivers/mtd/nand/nand_timings.c b/drivers/mtd/nand/nand_timings.c\nindex f06312df3669..90228b9735bd 100644\n--- a/drivers/mtd/nand/nand_timings.c\n+++ b/drivers/mtd/nand/nand_timings.c\n@@ -11,7 +11,7 @@\n #include <linux/kernel.h>\n #include <linux/err.h>\n #include <linux/export.h>\n-#include <linux/mtd/nand.h>\n+#include <linux/mtd/rawnand.h>\n \n static const struct nand_data_interface onfi_sdr_timings[] = {\n \t/* Mode 0 */\ndiff --git a/drivers/mtd/nand/nand_toshiba.c b/drivers/mtd/nand/nand_toshiba.c\nindex fa787ba38dcd..57df857074e6 100644\n--- a/drivers/mtd/nand/nand_toshiba.c\n+++ b/drivers/mtd/nand/nand_toshiba.c\n@@ -15,7 +15,7 @@\n * GNU General Public License for more details.\n */\n \n-#include <linux/mtd/nand.h>\n+#include <linux/mtd/rawnand.h>\n \n static void toshiba_nand_decode_id(struct nand_chip *chip)\n {\ndiff --git a/drivers/mtd/nand/nandsim.c b/drivers/mtd/nand/nandsim.c\nindex 03a0d057bf2f..5ba46354bf0f 100644\n--- a/drivers/mtd/nand/nandsim.c\n+++ b/drivers/mtd/nand/nandsim.c\n@@ -33,7 +33,7 @@\n #include <linux/errno.h>\n #include <linux/string.h>\n #include <linux/mtd/mtd.h>\n-#include <linux/mtd/nand.h>\n+#include <linux/mtd/rawnand.h>\n #include <linux/mtd/nand_bch.h>\n #include <linux/mtd/partitions.h>\n #include <linux/delay.h>\ndiff --git a/drivers/mtd/nand/ndfc.c b/drivers/mtd/nand/ndfc.c\nindex 28e6118362f7..d8a806894937 100644\n--- a/drivers/mtd/nand/ndfc.c\n+++ b/drivers/mtd/nand/ndfc.c\n@@ -22,7 +22,7 @@\n *\n */\n #include <linux/module.h>\n-#include <linux/mtd/nand.h>\n+#include <linux/mtd/rawnand.h>\n #include <linux/mtd/nand_ecc.h>\n #include <linux/mtd/partitions.h>\n #include <linux/mtd/ndfc.h>\ndiff --git a/drivers/mtd/nand/nuc900_nand.c b/drivers/mtd/nand/nuc900_nand.c\nindex 8f64011d32ef..7bb4d2ea9342 100644\n--- a/drivers/mtd/nand/nuc900_nand.c\n+++ b/drivers/mtd/nand/nuc900_nand.c\n@@ -19,7 +19,7 @@\n #include <linux/err.h>\n \n #include <linux/mtd/mtd.h>\n-#include <linux/mtd/nand.h>\n+#include <linux/mtd/rawnand.h>\n #include <linux/mtd/partitions.h>\n \n #define REG_FMICSR \t0x00\ndiff --git a/drivers/mtd/nand/omap2.c b/drivers/mtd/nand/omap2.c\nindex 084934a9f19c..54540c8fa1a2 100644\n--- a/drivers/mtd/nand/omap2.c\n+++ b/drivers/mtd/nand/omap2.c\n@@ -18,7 +18,7 @@\n #include <linux/jiffies.h>\n #include <linux/sched.h>\n #include <linux/mtd/mtd.h>\n-#include <linux/mtd/nand.h>\n+#include <linux/mtd/rawnand.h>\n #include <linux/mtd/partitions.h>\n #include <linux/omap-dma.h>\n #include <linux/io.h>\ndiff --git a/drivers/mtd/nand/orion_nand.c b/drivers/mtd/nand/orion_nand.c\nindex 41cb7acfc044..5a5aa1f07d07 100644\n--- a/drivers/mtd/nand/orion_nand.c\n+++ b/drivers/mtd/nand/orion_nand.c\n@@ -15,7 +15,7 @@\n #include <linux/platform_device.h>\n #include <linux/of.h>\n #include <linux/mtd/mtd.h>\n-#include <linux/mtd/nand.h>\n+#include <linux/mtd/rawnand.h>\n #include <linux/mtd/partitions.h>\n #include <linux/clk.h>\n #include <linux/err.h>\ndiff --git a/drivers/mtd/nand/oxnas_nand.c b/drivers/mtd/nand/oxnas_nand.c\nindex 7061bb2923b4..d649d5944826 100644\n--- a/drivers/mtd/nand/oxnas_nand.c\n+++ b/drivers/mtd/nand/oxnas_nand.c\n@@ -21,7 +21,7 @@\n #include <linux/clk.h>\n #include <linux/reset.h>\n #include <linux/mtd/mtd.h>\n-#include <linux/mtd/nand.h>\n+#include <linux/mtd/rawnand.h>\n #include <linux/mtd/partitions.h>\n #include <linux/of.h>\n \ndiff --git a/drivers/mtd/nand/pasemi_nand.c b/drivers/mtd/nand/pasemi_nand.c\nindex 074b8b01289e..a47a7e4bd25a 100644\n--- a/drivers/mtd/nand/pasemi_nand.c\n+++ b/drivers/mtd/nand/pasemi_nand.c\n@@ -25,7 +25,7 @@\n #include <linux/slab.h>\n #include <linux/module.h>\n #include <linux/mtd/mtd.h>\n-#include <linux/mtd/nand.h>\n+#include <linux/mtd/rawnand.h>\n #include <linux/mtd/nand_ecc.h>\n #include <linux/of_address.h>\n #include <linux/of_irq.h>\ndiff --git a/drivers/mtd/nand/plat_nand.c b/drivers/mtd/nand/plat_nand.c\nindex 791de3e4bbb6..925a1323604d 100644\n--- a/drivers/mtd/nand/plat_nand.c\n+++ b/drivers/mtd/nand/plat_nand.c\n@@ -15,7 +15,7 @@\n #include <linux/platform_device.h>\n #include <linux/slab.h>\n #include <linux/mtd/mtd.h>\n-#include <linux/mtd/nand.h>\n+#include <linux/mtd/rawnand.h>\n #include <linux/mtd/partitions.h>\n \n struct plat_nand_data {\ndiff --git a/drivers/mtd/nand/pxa3xx_nand.c b/drivers/mtd/nand/pxa3xx_nand.c\nindex 74dae4bbdac8..85cff68643e0 100644\n--- a/drivers/mtd/nand/pxa3xx_nand.c\n+++ b/drivers/mtd/nand/pxa3xx_nand.c\n@@ -21,7 +21,7 @@\n #include <linux/delay.h>\n #include <linux/clk.h>\n #include <linux/mtd/mtd.h>\n-#include <linux/mtd/nand.h>\n+#include <linux/mtd/rawnand.h>\n #include <linux/mtd/partitions.h>\n #include <linux/io.h>\n #include <linux/iopoll.h>\ndiff --git a/drivers/mtd/nand/qcom_nandc.c b/drivers/mtd/nand/qcom_nandc.c\nindex 0e727d79f2ce..fe65afecb8b7 100644\n--- a/drivers/mtd/nand/qcom_nandc.c\n+++ b/drivers/mtd/nand/qcom_nandc.c\n@@ -17,7 +17,7 @@\n #include <linux/dma-mapping.h>\n #include <linux/dmaengine.h>\n #include <linux/module.h>\n-#include <linux/mtd/nand.h>\n+#include <linux/mtd/rawnand.h>\n #include <linux/mtd/partitions.h>\n #include <linux/of.h>\n #include <linux/of_device.h>\ndiff --git a/drivers/mtd/nand/r852.h b/drivers/mtd/nand/r852.h\nindex d042ddb71a8b..8713c57f6207 100644\n--- a/drivers/mtd/nand/r852.h\n+++ b/drivers/mtd/nand/r852.h\n@@ -10,7 +10,7 @@\n #include <linux/pci.h>\n #include <linux/completion.h>\n #include <linux/workqueue.h>\n-#include <linux/mtd/nand.h>\n+#include <linux/mtd/rawnand.h>\n #include <linux/spinlock.h>\n \n \ndiff --git a/drivers/mtd/nand/s3c2410.c b/drivers/mtd/nand/s3c2410.c\nindex 9e0c849607b9..4c383eeec6f6 100644\n--- a/drivers/mtd/nand/s3c2410.c\n+++ b/drivers/mtd/nand/s3c2410.c\n@@ -43,7 +43,7 @@\n #include <linux/of_device.h>\n \n #include <linux/mtd/mtd.h>\n-#include <linux/mtd/nand.h>\n+#include <linux/mtd/rawnand.h>\n #include <linux/mtd/nand_ecc.h>\n #include <linux/mtd/partitions.h>\n \ndiff --git a/drivers/mtd/nand/sh_flctl.c b/drivers/mtd/nand/sh_flctl.c\nindex 891ac7b99305..2637b9052fe7 100644\n--- a/drivers/mtd/nand/sh_flctl.c\n+++ b/drivers/mtd/nand/sh_flctl.c\n@@ -38,7 +38,7 @@\n #include <linux/string.h>\n \n #include <linux/mtd/mtd.h>\n-#include <linux/mtd/nand.h>\n+#include <linux/mtd/rawnand.h>\n #include <linux/mtd/partitions.h>\n #include <linux/mtd/sh_flctl.h>\n \ndiff --git a/drivers/mtd/nand/sharpsl.c b/drivers/mtd/nand/sharpsl.c\nindex 064ca1757589..737efe83cd36 100644\n--- a/drivers/mtd/nand/sharpsl.c\n+++ b/drivers/mtd/nand/sharpsl.c\n@@ -17,7 +17,7 @@\n #include <linux/module.h>\n #include <linux/delay.h>\n #include <linux/mtd/mtd.h>\n-#include <linux/mtd/nand.h>\n+#include <linux/mtd/rawnand.h>\n #include <linux/mtd/nand_ecc.h>\n #include <linux/mtd/partitions.h>\n #include <linux/mtd/sharpsl.h>\ndiff --git a/drivers/mtd/nand/sm_common.c b/drivers/mtd/nand/sm_common.c\nindex 5939dff253c2..c378705c6e2b 100644\n--- a/drivers/mtd/nand/sm_common.c\n+++ b/drivers/mtd/nand/sm_common.c\n@@ -7,7 +7,7 @@\n * published by the Free Software Foundation.\n */\n #include <linux/kernel.h>\n-#include <linux/mtd/nand.h>\n+#include <linux/mtd/rawnand.h>\n #include <linux/module.h>\n #include <linux/sizes.h>\n #include \"sm_common.h\"\ndiff --git a/drivers/mtd/nand/socrates_nand.c b/drivers/mtd/nand/socrates_nand.c\nindex 72369bd079af..575997d0ef8a 100644\n--- a/drivers/mtd/nand/socrates_nand.c\n+++ b/drivers/mtd/nand/socrates_nand.c\n@@ -13,7 +13,7 @@\n #include <linux/slab.h>\n #include <linux/module.h>\n #include <linux/mtd/mtd.h>\n-#include <linux/mtd/nand.h>\n+#include <linux/mtd/rawnand.h>\n #include <linux/mtd/partitions.h>\n #include <linux/of_address.h>\n #include <linux/of_platform.h>\ndiff --git a/drivers/mtd/nand/sunxi_nand.c b/drivers/mtd/nand/sunxi_nand.c\nindex 6eb97451f485..f1cd5eb47e51 100644\n--- a/drivers/mtd/nand/sunxi_nand.c\n+++ b/drivers/mtd/nand/sunxi_nand.c\n@@ -31,7 +31,7 @@\n #include <linux/of_device.h>\n #include <linux/of_gpio.h>\n #include <linux/mtd/mtd.h>\n-#include <linux/mtd/nand.h>\n+#include <linux/mtd/rawnand.h>\n #include <linux/mtd/partitions.h>\n #include <linux/clk.h>\n #include <linux/delay.h>\ndiff --git a/drivers/mtd/nand/tango_nand.c b/drivers/mtd/nand/tango_nand.c\nindex 9d40b793b1c4..766906f03943 100644\n--- a/drivers/mtd/nand/tango_nand.c\n+++ b/drivers/mtd/nand/tango_nand.c\n@@ -11,7 +11,7 @@\n #include <linux/clk.h>\n #include <linux/iopoll.h>\n #include <linux/module.h>\n-#include <linux/mtd/nand.h>\n+#include <linux/mtd/rawnand.h>\n #include <linux/dmaengine.h>\n #include <linux/dma-mapping.h>\n #include <linux/platform_device.h>\ndiff --git a/drivers/mtd/nand/tmio_nand.c b/drivers/mtd/nand/tmio_nand.c\nindex fc5e773f8b60..c9dd682fb353 100644\n--- a/drivers/mtd/nand/tmio_nand.c\n+++ b/drivers/mtd/nand/tmio_nand.c\n@@ -34,7 +34,7 @@\n #include <linux/interrupt.h>\n #include <linux/ioport.h>\n #include <linux/mtd/mtd.h>\n-#include <linux/mtd/nand.h>\n+#include <linux/mtd/rawnand.h>\n #include <linux/mtd/nand_ecc.h>\n #include <linux/mtd/partitions.h>\n #include <linux/slab.h>\ndiff --git a/drivers/mtd/nand/txx9ndfmc.c b/drivers/mtd/nand/txx9ndfmc.c\nindex 0a14fda2e41b..b567d212fe7d 100644\n--- a/drivers/mtd/nand/txx9ndfmc.c\n+++ b/drivers/mtd/nand/txx9ndfmc.c\n@@ -16,7 +16,7 @@\n #include <linux/platform_device.h>\n #include <linux/delay.h>\n #include <linux/mtd/mtd.h>\n-#include <linux/mtd/nand.h>\n+#include <linux/mtd/rawnand.h>\n #include <linux/mtd/nand_ecc.h>\n #include <linux/mtd/partitions.h>\n #include <linux/io.h>\ndiff --git a/drivers/mtd/nand/vf610_nfc.c b/drivers/mtd/nand/vf610_nfc.c\nindex b88a0c91b455..8037d4b48a05 100644\n--- a/drivers/mtd/nand/vf610_nfc.c\n+++ b/drivers/mtd/nand/vf610_nfc.c\n@@ -31,7 +31,7 @@\n #include <linux/interrupt.h>\n #include <linux/io.h>\n #include <linux/mtd/mtd.h>\n-#include <linux/mtd/nand.h>\n+#include <linux/mtd/rawnand.h>\n #include <linux/mtd/partitions.h>\n #include <linux/of_device.h>\n #include <linux/platform_device.h>\ndiff --git a/drivers/mtd/nand/xway_nand.c b/drivers/mtd/nand/xway_nand.c\nindex ddee4005248c..9926b4e3d69d 100644\n--- a/drivers/mtd/nand/xway_nand.c\n+++ b/drivers/mtd/nand/xway_nand.c\n@@ -7,7 +7,7 @@\n * Copyright © 2016 Hauke Mehrtens <hauke@hauke-m.de>\n */\n \n-#include <linux/mtd/nand.h>\n+#include <linux/mtd/rawnand.h>\n #include <linux/of_gpio.h>\n #include <linux/of_platform.h>\n \ndiff --git a/drivers/mtd/nftlcore.c b/drivers/mtd/nftlcore.c\nindex e21161353e76..1f1a61168b3d 100644\n--- a/drivers/mtd/nftlcore.c\n+++ b/drivers/mtd/nftlcore.c\n@@ -34,7 +34,7 @@\n \n #include <linux/kmod.h>\n #include <linux/mtd/mtd.h>\n-#include <linux/mtd/nand.h>\n+#include <linux/mtd/rawnand.h>\n #include <linux/mtd/nftl.h>\n #include <linux/mtd/blktrans.h>\n \ndiff --git a/drivers/mtd/nftlmount.c b/drivers/mtd/nftlmount.c\nindex a5dfbfbebfca..184c8fbfe465 100644\n--- a/drivers/mtd/nftlmount.c\n+++ b/drivers/mtd/nftlmount.c\n@@ -25,7 +25,7 @@\n #include <linux/delay.h>\n #include <linux/slab.h>\n #include <linux/mtd/mtd.h>\n-#include <linux/mtd/nand.h>\n+#include <linux/mtd/rawnand.h>\n #include <linux/mtd/nftl.h>\n \n #define SECTORSIZE 512\ndiff --git a/drivers/mtd/ssfdc.c b/drivers/mtd/ssfdc.c\nindex 41b13d1cdcc4..95f0bf95f095 100644\n--- a/drivers/mtd/ssfdc.c\n+++ b/drivers/mtd/ssfdc.c\n@@ -16,7 +16,7 @@\n #include <linux/slab.h>\n #include <linux/hdreg.h>\n #include <linux/mtd/mtd.h>\n-#include <linux/mtd/nand.h>\n+#include <linux/mtd/rawnand.h>\n #include <linux/mtd/blktrans.h>\n \n struct ssfdcr_record {\ndiff --git a/drivers/mtd/tests/nandbiterrs.c b/drivers/mtd/tests/nandbiterrs.c\nindex f26dec896afa..5f03b8c885a9 100644\n--- a/drivers/mtd/tests/nandbiterrs.c\n+++ b/drivers/mtd/tests/nandbiterrs.c\n@@ -47,7 +47,7 @@\n #include <linux/moduleparam.h>\n #include <linux/mtd/mtd.h>\n #include <linux/err.h>\n-#include <linux/mtd/nand.h>\n+#include <linux/mtd/rawnand.h>\n #include <linux/slab.h>\n #include \"mtd_test.h\"\n \ndiff --git a/drivers/staging/mt29f_spinand/mt29f_spinand.c b/drivers/staging/mt29f_spinand/mt29f_spinand.c\nindex a4e3ae8f0c85..13eaf16ecd16 100644\n--- a/drivers/staging/mt29f_spinand/mt29f_spinand.c\n+++ b/drivers/staging/mt29f_spinand/mt29f_spinand.c\n@@ -18,7 +18,7 @@\n #include <linux/delay.h>\n #include <linux/mtd/mtd.h>\n #include <linux/mtd/partitions.h>\n-#include <linux/mtd/nand.h>\n+#include <linux/mtd/rawnand.h>\n #include <linux/spi/spi.h>\n \n #include \"mt29f_spinand.h\"\ndiff --git a/fs/jffs2/wbuf.c b/fs/jffs2/wbuf.c\nindex b25d28a21212..48d9522e209c 100644\n--- a/fs/jffs2/wbuf.c\n+++ b/fs/jffs2/wbuf.c\n@@ -17,7 +17,7 @@\n #include <linux/slab.h>\n #include <linux/mtd/mtd.h>\n #include <linux/crc32.h>\n-#include <linux/mtd/nand.h>\n+#include <linux/mtd/rawnand.h>\n #include <linux/jiffies.h>\n #include <linux/sched.h>\n #include <linux/writeback.h>\ndiff --git a/include/linux/mtd/nand-gpio.h b/include/linux/mtd/nand-gpio.h\nindex 51534e50f7fc..be4f45d89be2 100644\n--- a/include/linux/mtd/nand-gpio.h\n+++ b/include/linux/mtd/nand-gpio.h\n@@ -1,7 +1,7 @@\n #ifndef __LINUX_MTD_NAND_GPIO_H\n #define __LINUX_MTD_NAND_GPIO_H\n \n-#include <linux/mtd/nand.h>\n+#include <linux/mtd/rawnand.h>\n \n struct gpio_nand_platdata {\n \tint\tgpio_nce;\ndiff --git a/include/linux/mtd/nand.h b/include/linux/mtd/rawnand.h\nsimilarity index 99%\nrename from include/linux/mtd/nand.h\nrename to include/linux/mtd/rawnand.h\nindex 297684013977..8fb488d586d6 100644\n--- a/include/linux/mtd/nand.h\n+++ b/include/linux/mtd/rawnand.h\n@@ -1,6 +1,4 @@\n /*\n- * linux/include/linux/mtd/nand.h\n- *\n * Copyright © 2000-2010 David Woodhouse <dwmw2@infradead.org>\n * Steven J. Hill <sjhill@realitydiluted.com>\n *\t\t Thomas Gleixner <tglx@linutronix.de>\n@@ -15,8 +13,8 @@\n * Changelog:\n *\tSee git changelog.\n */\n-#ifndef __LINUX_MTD_NAND_H\n-#define __LINUX_MTD_NAND_H\n+#ifndef __LINUX_MTD_RAWNAND_H\n+#define __LINUX_MTD_RAWNAND_H\n \n #include <linux/wait.h>\n #include <linux/spinlock.h>\n@@ -1318,4 +1316,4 @@ void nand_cleanup(struct nand_chip *chip);\n \n /* Default extended ID decoding function */\n void nand_decode_ext_id(struct nand_chip *chip);\n-#endif /* __LINUX_MTD_NAND_H */\n+#endif /* __LINUX_MTD_RAWNAND_H */\ndiff --git a/include/linux/mtd/sh_flctl.h b/include/linux/mtd/sh_flctl.h\nindex 2251add65fa7..c759d403cbc0 100644\n--- a/include/linux/mtd/sh_flctl.h\n+++ b/include/linux/mtd/sh_flctl.h\n@@ -22,7 +22,7 @@\n \n #include <linux/completion.h>\n #include <linux/mtd/mtd.h>\n-#include <linux/mtd/nand.h>\n+#include <linux/mtd/rawnand.h>\n #include <linux/mtd/partitions.h>\n #include <linux/pm_qos.h>\n \ndiff --git a/include/linux/mtd/sharpsl.h b/include/linux/mtd/sharpsl.h\nindex 65e91d0fa981..72a79c7d0e08 100644\n--- a/include/linux/mtd/sharpsl.h\n+++ b/include/linux/mtd/sharpsl.h\n@@ -8,7 +8,7 @@\n * published by the Free Software Foundation.\n */\n \n-#include <linux/mtd/nand.h>\n+#include <linux/mtd/rawnand.h>\n #include <linux/mtd/nand_ecc.h>\n #include <linux/mtd/partitions.h>\n \ndiff --git a/include/linux/platform_data/mtd-davinci.h b/include/linux/platform_data/mtd-davinci.h\nindex 1cf555aef896..f1a2cf655bdb 100644\n--- a/include/linux/platform_data/mtd-davinci.h\n+++ b/include/linux/platform_data/mtd-davinci.h\n@@ -28,7 +28,7 @@\n #ifndef __ARCH_ARM_DAVINCI_NAND_H\n #define __ARCH_ARM_DAVINCI_NAND_H\n \n-#include <linux/mtd/nand.h>\n+#include <linux/mtd/rawnand.h>\n \n #define NANDFCR_OFFSET\t\t0x60\n #define NANDFSR_OFFSET\t\t0x64\ndiff --git a/include/linux/platform_data/mtd-nand-s3c2410.h b/include/linux/platform_data/mtd-nand-s3c2410.h\nindex f01659026b26..f8c553f92655 100644\n--- a/include/linux/platform_data/mtd-nand-s3c2410.h\n+++ b/include/linux/platform_data/mtd-nand-s3c2410.h\n@@ -12,7 +12,7 @@\n #ifndef __MTD_NAND_S3C2410_H\n #define __MTD_NAND_S3C2410_H\n \n-#include <linux/mtd/nand.h>\n+#include <linux/mtd/rawnand.h>\n \n /**\n * struct s3c2410_nand_set - define a set of one or more nand chips\n", "prefixes": [] }