GitHub-Mirror/Star64_linux
2
0
Fork 0
mirror of https://github.com/Fishwaldo/Star64_linux.git synced 2025-06-23 15:11:16 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'nand/rename-header-file' of git://git.infradead.org/l2-mtd into nand/next

Browse source
This commit is contained in:
Boris Brezillon 2017-08-23 17:00:12 +02:00
commit a75d6a4ceb
128 changed files with 133 additions and 135 deletions
Download patch file Download diff file Expand all files Collapse all files

2
include/linux/mtd/nand-gpio.h
View file

@ -1,7 +1,7 @@
#ifndef __LINUX_MTD_NAND_GPIO_H
#define __LINUX_MTD_NAND_GPIO_H
#include <linux/mtd/nand.h>
#include <linux/mtd/rawnand.h>
struct gpio_nand_platdata {
int gpio_nce;

8
include/linux/mtd/nand.h → include/linux/mtd/rawnand.h
View file

@ -1,6 +1,4 @@
/*
* linux/include/linux/mtd/nand.h
*
* Copyright © 2000-2010 David Woodhouse <dwmw2@infradead.org>
* Steven J. Hill <sjhill@realitydiluted.com>
* Thomas Gleixner <tglx@linutronix.de>
@ -15,8 +13,8 @@
* Changelog:
* See git changelog.
*/
#ifndef __LINUX_MTD_NAND_H
#define __LINUX_MTD_NAND_H
#ifndef __LINUX_MTD_RAWNAND_H
#define __LINUX_MTD_RAWNAND_H
#include <linux/wait.h>
#include <linux/spinlock.h>
@ -1318,4 +1316,4 @@ void nand_cleanup(struct nand_chip *chip);
/* Default extended ID decoding function */
void nand_decode_ext_id(struct nand_chip *chip);
#endif /* __LINUX_MTD_NAND_H */
#endif /* __LINUX_MTD_RAWNAND_H */

2
include/linux/mtd/sh_flctl.h
View file

@ -22,7 +22,7 @@
#include <linux/completion.h>
#include <linux/mtd/mtd.h>
#include <linux/mtd/nand.h>
#include <linux/mtd/rawnand.h>
#include <linux/mtd/partitions.h>
#include <linux/pm_qos.h>

2
include/linux/mtd/sharpsl.h
View file

@ -8,7 +8,7 @@
* published by the Free Software Foundation.
*/
#include <linux/mtd/nand.h>
#include <linux/mtd/rawnand.h>
#include <linux/mtd/nand_ecc.h>
#include <linux/mtd/partitions.h>