Merge branch 'master' into csb1725

[mv-sheeva.git] / drivers / staging / spectra / lld_emu.c

diff --git a/drivers/staging/spectra/lld_emu.c b/drivers/staging/spectra/lld_emu.c
index 60eb0f6fdba4a10c34533a93afbe197e3fb112f2..6733bbf8016db0e14c1d917ffe385f00394eda94 100644 (file)
--- a/drivers/staging/spectra/lld_emu.c
+++ b/drivers/staging/spectra/lld_emu.c
@@ -25,6 +25,10 @@
 #include "lld.h"
 #if CMD_DMA
 #include "lld_cdma.h"
+#if FLASH_EMU
+u32 totalUsedBanks;
+u32 valid_banks[MAX_CHANS];
+#endif
 #endif
 
 #define GLOB_LLD_PAGES           64
@@ -32,12 +36,6 @@
 #define GLOB_LLD_PAGE_DATA_SIZE  512
 #define GLOB_LLD_BLOCKS          2048
 
-#if (CMD_DMA  && FLASH_EMU)
-#include "lld_cdma.h"
-u32 totalUsedBanks;
-u32 valid_banks[MAX_CHANS];
-#endif
-
 #if FLASH_EMU                  /* This is for entire module */
 
 static u8 *flash_memory[GLOB_LLD_BLOCKS * GLOB_LLD_PAGES];