diff options
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 b70e83c03bed..2bc112adf565 100644 --- a/arch/arm/mach-davinci/board-neuros-osd2.c +++ b/arch/arm/mach-davinci/board-neuros-osd2.c | |||
@@ -166,20 +166,9 @@ static struct davinci_mmc_config davinci_ntosd2_mmc_config = { | |||
166 | .wires = 4, | 166 | .wires = 4, |
167 | }; | 167 | }; |
168 | 168 | ||
169 | #define HAS_ATA IS_ENABLED(CONFIG_BLK_DEV_PALMCHIP_BK3710) | ||
169 | 170 | ||
170 | #if defined(CONFIG_BLK_DEV_PALMCHIP_BK3710) || \ | 171 | #define HAS_NAND IS_ENABLED(CONFIG_MTD_NAND_DAVINCI) |
171 | defined(CONFIG_BLK_DEV_PALMCHIP_BK3710_MODULE) | ||
172 | #define HAS_ATA 1 | ||
173 | #else | ||
174 | #define HAS_ATA 0 | ||
175 | #endif | ||
176 | |||
177 | #if defined(CONFIG_MTD_NAND_DAVINCI) || \ | ||
178 | defined(CONFIG_MTD_NAND_DAVINCI_MODULE) | ||
179 | #define HAS_NAND 1 | ||
180 | #else | ||
181 | #define HAS_NAND 0 | ||
182 | #endif | ||
183 | 172 | ||
184 | static __init void davinci_ntosd2_init(void) | 173 | static __init void davinci_ntosd2_init(void) |
185 | { | 174 | { |