diff options
author | Nicolas Kaiser <nikai@nikai.net> | 2010-10-04 08:10:45 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-10-05 14:42:20 -0400 |
commit | e80302977017e5cbb12fdf843e5a070ad5d11e3a (patch) | |
tree | 76b7ce65cc76a7f643b6be2e12675c8399b3761e | |
parent | 3f609dd661ec5f34adcfdde07470f5691c567259 (diff) |
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>
-rw-r--r-- | drivers/staging/spectra/lld_emu.c | 10 | ||||
-rw-r--r-- | drivers/staging/spectra/lld_mtd.c | 8 |
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 @@ | |||
25 | #include "lld.h" | 25 | #include "lld.h" |
26 | #if CMD_DMA | 26 | #if CMD_DMA |
27 | #include "lld_cdma.h" | 27 | #include "lld_cdma.h" |
28 | #if FLASH_EMU | ||
29 | u32 totalUsedBanks; | ||
30 | u32 valid_banks[MAX_CHANS]; | ||
31 | #endif | ||
28 | #endif | 32 | #endif |
29 | 33 | ||
30 | #define GLOB_LLD_PAGES 64 | 34 | #define GLOB_LLD_PAGES 64 |
@@ -32,12 +36,6 @@ | |||
32 | #define GLOB_LLD_PAGE_DATA_SIZE 512 | 36 | #define GLOB_LLD_PAGE_DATA_SIZE 512 |
33 | #define GLOB_LLD_BLOCKS 2048 | 37 | #define GLOB_LLD_BLOCKS 2048 |
34 | 38 | ||
35 | #if (CMD_DMA && FLASH_EMU) | ||
36 | #include "lld_cdma.h" | ||
37 | u32 totalUsedBanks; | ||
38 | u32 valid_banks[MAX_CHANS]; | ||
39 | #endif | ||
40 | |||
41 | #if FLASH_EMU /* This is for entire module */ | 39 | #if FLASH_EMU /* This is for entire module */ |
42 | 40 | ||
43 | static u8 *flash_memory[GLOB_LLD_BLOCKS * GLOB_LLD_PAGES]; | 41 | 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 @@ | |||
26 | #include "lld.h" | 26 | #include "lld.h" |
27 | #if CMD_DMA | 27 | #if CMD_DMA |
28 | #include "lld_cdma.h" | 28 | #include "lld_cdma.h" |
29 | u32 totalUsedBanks; | ||
30 | u32 valid_banks[MAX_CHANS]; | ||
29 | #endif | 31 | #endif |
30 | 32 | ||
31 | #define GLOB_LLD_PAGES 64 | 33 | #define GLOB_LLD_PAGES 64 |
@@ -33,12 +35,6 @@ | |||
33 | #define GLOB_LLD_PAGE_DATA_SIZE 512 | 35 | #define GLOB_LLD_PAGE_DATA_SIZE 512 |
34 | #define GLOB_LLD_BLOCKS 2048 | 36 | #define GLOB_LLD_BLOCKS 2048 |
35 | 37 | ||
36 | #if CMD_DMA | ||
37 | #include "lld_cdma.h" | ||
38 | u32 totalUsedBanks; | ||
39 | u32 valid_banks[MAX_CHANS]; | ||
40 | #endif | ||
41 | |||
42 | static struct mtd_info *spectra_mtd; | 38 | static struct mtd_info *spectra_mtd; |
43 | static int mtddev = -1; | 39 | static int mtddev = -1; |
44 | module_param(mtddev, int, 0); | 40 | module_param(mtddev, int, 0); |