---

yaml --- r: 220083 b: refs/heads/master c: e803029 h: refs/heads/master i: 220081: b7f77c6 220079: bd9dcaa v: v3
git-mirror · Oct 5, 2010 · 1db8930 · 1db8930
1 parent 25057f4
commit 1db8930
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 13 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3f609dd661ec5f34adcfdde07470f5691c567259
+refs/heads/master: e80302977017e5cbb12fdf843e5a070ad5d11e3a
diff --git a/trunk/drivers/staging/spectra/lld_emu.c b/trunk/drivers/staging/spectra/lld_emu.c
@@ -25,19 +25,17 @@
 #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
 #define GLOB_LLD_PAGE_SIZE       (512+16)
 #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];

diff --git a/trunk/drivers/staging/spectra/lld_mtd.c b/trunk/drivers/staging/spectra/lld_mtd.c
@@ -26,19 +26,15 @@
 #include "lld.h"
 #if CMD_DMA
 #include "lld_cdma.h"
+u32 totalUsedBanks;
+u32 valid_banks[MAX_CHANS];
 #endif
 
 #define GLOB_LLD_PAGES           64
 #define GLOB_LLD_PAGE_SIZE       (512+16)
 #define GLOB_LLD_PAGE_DATA_SIZE  512
 #define GLOB_LLD_BLOCKS          2048
 
-#if CMD_DMA
-#include "lld_cdma.h"
-u32 totalUsedBanks;
-u32 valid_banks[MAX_CHANS];
-#endif
-
 static struct mtd_info *spectra_mtd;
 static int mtddev = -1;
 module_param(mtddev, int, 0);