diff options
| author | John W. Linville <linville@tuxdriver.com> | 2013-02-08 13:16:17 -0500 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2013-02-08 13:16:17 -0500 |
| commit | f5237f278f30a92401539a54f87ee0c717b6f818 (patch) | |
| tree | 209d4fd6fb00e660c76ca8ac5d4caed59dbb9957 /include/linux/bcma/bcma_driver_chipcommon.h | |
| parent | b285109dde7b873b5dc671ef1b3ae3090f4bc72f (diff) | |
| parent | b26f5f09ebdeb85ab152344cc1d6d484a3ce967d (diff) | |
| download | op-kernel-dev-f5237f278f30a92401539a54f87ee0c717b6f818.zip op-kernel-dev-f5237f278f30a92401539a54f87ee0c717b6f818.tar.gz | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem
Diffstat (limited to 'include/linux/bcma/bcma_driver_chipcommon.h')
| -rw-r--r-- | include/linux/bcma/bcma_driver_chipcommon.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/bcma/bcma_driver_chipcommon.h b/include/linux/bcma/bcma_driver_chipcommon.h index ee332fa..1d002b5 100644 --- a/include/linux/bcma/bcma_driver_chipcommon.h +++ b/include/linux/bcma/bcma_driver_chipcommon.h @@ -27,7 +27,7 @@ #define BCMA_CC_FLASHT_NONE 0x00000000 /* No flash */ #define BCMA_CC_FLASHT_STSER 0x00000100 /* ST serial flash */ #define BCMA_CC_FLASHT_ATSER 0x00000200 /* Atmel serial flash */ -#define BCMA_CC_FLASHT_NFLASH 0x00000200 /* NAND flash */ +#define BCMA_CC_FLASHT_NAND 0x00000300 /* NAND flash */ #define BCMA_CC_FLASHT_PARA 0x00000700 /* Parallel flash */ #define BCMA_CC_CAP_PLLT 0x00038000 /* PLL Type */ #define BCMA_PLLTYPE_NONE 0x00000000 |
