From: Rafał Miłecki Date: Fri, 1 Feb 2013 07:46:56 +0000 (+0100) Subject: bcma: cc: fix (and rename) define of NAND flash type X-Git-Tag: v3.12-rc1~1418^2~31^2^2~88 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=97cc019ee56d52005ea4544af17bef268c464862;p=kernel%2Fkernel-generic.git bcma: cc: fix (and rename) define of NAND flash type Signed-off-by: Rafał Miłecki Signed-off-by: John W. Linville --- diff --git a/include/linux/bcma/bcma_driver_chipcommon.h b/include/linux/bcma/bcma_driver_chipcommon.h index 9a0e3fa..6a299f4 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