From 1db893046a55dcb8cb106db45c81e6f4159fbda6 Mon Sep 17 00:00:00 2001
From: Nicolas Kaiser <nikai@nikai.net>
Date: Mon, 4 Oct 2010 14:10:45 +0200
Subject: [PATCH] --- yaml --- r: 220083 b: refs/heads/master c:
 e80302977017e5cbb12fdf843e5a070ad5d11e3a h: refs/heads/master i:   220081:
 b7f77c6fe0eac07aac7a97db7f97bc6899faa3b8   220079:
 bd9dcaa37c0d80ec1b1370dc8092ad8a731ef4a8 v: v3

---
 [refs]                                  |  2 +-
 trunk/drivers/staging/spectra/lld_emu.c | 10 ++++------
 trunk/drivers/staging/spectra/lld_mtd.c |  8 ++------
 3 files changed, 7 insertions(+), 13 deletions(-)

diff --git a/[refs] b/[refs]
index 101773694b29..847575517701 100644
--- 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
index 60eb0f6fdba4..6733bbf8016d 100644
--- a/trunk/drivers/staging/spectra/lld_emu.c
+++ b/trunk/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];
diff --git a/trunk/drivers/staging/spectra/lld_mtd.c b/trunk/drivers/staging/spectra/lld_mtd.c
index 0de05b1e75f7..2bd34662beb5 100644
--- a/trunk/drivers/staging/spectra/lld_mtd.c
+++ b/trunk/drivers/staging/spectra/lld_mtd.c
@@ -26,6 +26,8 @@
 #include "lld.h"
 #if CMD_DMA
 #include "lld_cdma.h"
+u32 totalUsedBanks;
+u32 valid_banks[MAX_CHANS];
 #endif
 
 #define GLOB_LLD_PAGES           64
@@ -33,12 +35,6 @@
 #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);