projects
/
linux-2.6-microblaze.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'for-linus-20171120' of git://git.infradead.org/linux-mtd
[linux-2.6-microblaze.git]
/
include
/
linux
/
platform_data
/
mtd-nand-omap2.h
diff --git
a/include/linux/platform_data/mtd-nand-omap2.h
b/include/linux/platform_data/mtd-nand-omap2.h
index
8b8b124
..
619df24
100644
(file)
--- a/
include/linux/platform_data/mtd-nand-omap2.h
+++ b/
include/linux/platform_data/mtd-nand-omap2.h
@@
-63,7
+63,5
@@
struct gpmc_nand_regs {
void __iomem *gpmc_bch_result4[GPMC_BCH_NUM_REMAINDER];
void __iomem *gpmc_bch_result5[GPMC_BCH_NUM_REMAINDER];
void __iomem *gpmc_bch_result6[GPMC_BCH_NUM_REMAINDER];
- /* Deprecated. Do not use */
- void __iomem *gpmc_status;
};
#endif