diff options
| author | Lad, Prabhakar <prabhakar.csengg@gmail.com> | 2013-04-01 12:43:44 +0530 |
|---|---|---|
| committer | Sekhar Nori <nsekhar@ti.com> | 2013-04-02 15:31:15 +0530 |
| commit | a0a56db9771f57667daff41cfa2546dad1abe6d9 (patch) | |
| tree | c763932dde9e46918b72ea82fd19a287ce94283d /arch/arm/mach-davinci/board-neuros-osd2.c | |
| parent | ab70db5b81ac25691a5e040168fe4ea7fae7f39d (diff) | |
| download | blackbird-op-linux-a0a56db9771f57667daff41cfa2546dad1abe6d9.tar.gz blackbird-op-linux-a0a56db9771f57667daff41cfa2546dad1abe6d9.zip | |
ARM: davinci: use is IS_ENABLED macro
This patches replaces #if defined() by IS_ENABLED macro, which provides
better readability.
Signed-off-by: Lad, Prabhakar <prabhakar.csengg@gmail.com>
Cc: Sekhar Nori <nsekhar@ti.com>
Cc: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Randy Dunlap <rdunlap@infradead.org>
Signed-off-by: Sekhar Nori <nsekhar@ti.com>
Diffstat (limited to 'arch/arm/mach-davinci/board-neuros-osd2.c')
| -rw-r--r-- | arch/arm/mach-davinci/board-neuros-osd2.c | 15 |
1 files changed, 2 insertions, 13 deletions
diff --git a/arch/arm/mach-davinci/board-neuros-osd2.c b/arch/arm/mach-davinci/board-neuros-osd2.c index 1c98107527fa..ea6728be53ba 100644 --- a/arch/arm/mach-davinci/board-neuros-osd2.c +++ b/arch/arm/mach-davinci/board-neuros-osd2.c @@ -167,20 +167,9 @@ static struct davinci_mmc_config davinci_ntosd2_mmc_config = { .version = MMC_CTLR_VERSION_1 }; +#define HAS_ATA IS_ENABLED(CONFIG_BLK_DEV_PALMCHIP_BK3710) -#if defined(CONFIG_BLK_DEV_PALMCHIP_BK3710) || \ - defined(CONFIG_BLK_DEV_PALMCHIP_BK3710_MODULE) -#define HAS_ATA 1 -#else -#define HAS_ATA 0 -#endif - -#if defined(CONFIG_MTD_NAND_DAVINCI) || \ - defined(CONFIG_MTD_NAND_DAVINCI_MODULE) -#define HAS_NAND 1 -#else -#define HAS_NAND 0 -#endif +#define HAS_NAND IS_ENABLED(CONFIG_MTD_NAND_DAVINCI) static __init void davinci_ntosd2_init(void) { |
