lists.openwall.net   lists  /  announce  owl-users  owl-dev  john-users  john-dev  passwdqc-users  yescrypt  popa3d-users  /  oss-security  kernel-hardening  musl  sabotage  tlsify  passwords  /  crypt-dev  xvendor  /  Bugtraq  Full-Disclosure  linux-kernel  linux-netdev  linux-ext4  linux-hardening  linux-cve-announce  PHC 
Open Source and information security mailing list archives
 
Hash Suite: Windows password security audit tool. GUI, reports in PDF.
[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <20101004141045.0454ad66@absol.kitzblitz>
Date:	Mon, 4 Oct 2010 14:10:45 +0200
From:	Nicolas Kaiser <nikai@...ai.net>
To:	Greg Kroah-Hartman <gregkh@...e.de>
Cc:	devel@...verdev.osuosl.org, linux-kernel@...r.kernel.org
Subject: [PATCH 2/3] staging/spectra: remove duplicated includes

Remove duplicated includes.

Signed-off-by: Nicolas Kaiser <nikai@...ai.net>
---
 drivers/staging/spectra/lld_emu.c |   10 ++++------
 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 60eb0f6..6733bbf 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 0de05b1..2bd3466 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);
-- 
1.7.2.2
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Powered by blists - more mailing lists

Powered by Openwall GNU/*/Linux Powered by OpenVZ