diff options
| author | Tom Rini <[email protected]> | 2021-10-06 12:26:33 -0400 |
|---|---|---|
| committer | Tom Rini <[email protected]> | 2021-10-06 13:46:31 -0400 |
| commit | ea67f467a43e4c8852bd1ce1bb75f5dc6c3788d1 (patch) | |
| tree | 1bbf310f2b22ad465d5698bfdf71347129834561 /include/linux | |
| parent | 7240e1b8f94a56db88a2af688cad27e2e6545302 (diff) | |
| parent | 6115f1c4fe81015369e110ea9830a6e36710677c (diff) | |
Merge branch '2021-10-06-assorted-improvements'
- Use better values for ACPI OEM_VERSION
- Assorted NAND related Kconifg migrations and another dependency fix
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/mtd/bbm.h | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/include/linux/mtd/bbm.h b/include/linux/mtd/bbm.h index 7239eb1125c..fb86f1ddef9 100644 --- a/include/linux/mtd/bbm.h +++ b/include/linux/mtd/bbm.h @@ -15,11 +15,6 @@ #ifndef __LINUX_MTD_BBM_H #define __LINUX_MTD_BBM_H -/* The maximum number of NAND chips in an array */ -#ifndef CONFIG_SYS_NAND_MAX_CHIPS -#define CONFIG_SYS_NAND_MAX_CHIPS 1 -#endif - /** * struct nand_bbt_descr - bad block table descriptor * @options: options for this descriptor |