summaryrefslogtreecommitdiffstats
path: root/drivers/staging/spectra
diff options
context:
space:
mode:
authorNicolas Kaiser <nikai@nikai.net>2010-10-04 14:10:45 +0200
committerGreg Kroah-Hartman <gregkh@suse.de>2010-10-05 11:42:20 -0700
commite80302977017e5cbb12fdf843e5a070ad5d11e3a (patch)
tree76b7ce65cc76a7f643b6be2e12675c8399b3761e /drivers/staging/spectra
parent3f609dd661ec5f34adcfdde07470f5691c567259 (diff)
downloadtalos-op-linux-e80302977017e5cbb12fdf843e5a070ad5d11e3a.tar.gz
talos-op-linux-e80302977017e5cbb12fdf843e5a070ad5d11e3a.zip
staging: spectra: remove duplicated includes
Remove duplicated includes. Signed-off-by: Nicolas Kaiser <nikai@nikai.net> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/spectra')
-rw-r--r--drivers/staging/spectra/lld_emu.c10
-rw-r--r--drivers/staging/spectra/lld_mtd.c8
2 files changed, 6 insertions, 12 deletions
diff --git a/drivers/staging/spectra/lld_emu.c b/drivers/staging/spectra/lld_emu.c
index 60eb0f6fdba4..6733bbf8016d 100644
--- 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];
diff --git a/drivers/staging/spectra/lld_mtd.c b/drivers/staging/spectra/lld_mtd.c
index 0de05b1e75f7..2bd34662beb5 100644
--- a/drivers/staging/spectra/lld_mtd.c
+++ b/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);
OpenPOWER on IntegriCloud