]> bbs.cooldavid.org Git - net-next-2.6.git/commitdiff
staging: spectra: remove duplicated includes
authorNicolas Kaiser <nikai@nikai.net>
Mon, 4 Oct 2010 12:10:45 +0000 (14:10 +0200)
committerGreg Kroah-Hartman <gregkh@suse.de>
Tue, 5 Oct 2010 18:42:20 +0000 (11:42 -0700)
Remove duplicated includes.

Signed-off-by: Nicolas Kaiser <nikai@nikai.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
drivers/staging/spectra/lld_emu.c
drivers/staging/spectra/lld_mtd.c

index 60eb0f6fdba4a10c34533a93afbe197e3fb112f2..6733bbf8016db0e14c1d917ffe385f00394eda94 100644 (file)
 #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_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];
index 0de05b1e75f76f6d23a8552fe7cb9c813498aec9..2bd34662beb5bea4e8606bbc3dcaf20f64d4b6f6 100644 (file)
@@ -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
 #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);