From: Nicolas Kaiser <nikai@nikai.net>
To: Greg Kroah-Hartman <gregkh@suse.de>
Cc: devel@driverdev.osuosl.org, linux-kernel@vger.kernel.org
Subject: [PATCH 2/3] staging/spectra: remove duplicated includes
Date: Mon, 4 Oct 2010 14:10:45 +0200 [thread overview]
Message-ID: <20101004141045.0454ad66@absol.kitzblitz> (raw)
In-Reply-To: <20101004140610.2c8fb91a@absol.kitzblitz>
Remove duplicated includes.
Signed-off-by: Nicolas Kaiser <nikai@nikai.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
next prev parent reply other threads:[~2010-10-04 12:16 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-10-04 12:06 [PATCH 0/3] staging: remove duplicated includes Nicolas Kaiser
2010-10-04 12:08 ` [PATCH 1/3] staging/lirc: remove duplicated include Nicolas Kaiser
2010-10-04 12:10 ` Nicolas Kaiser [this message]
2010-10-04 12:12 ` [PATCH 3/3] staging/tidspbridge: " Nicolas Kaiser
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20101004141045.0454ad66@absol.kitzblitz \
--to=nikai@nikai.net \
--cc=devel@driverdev.osuosl.org \
--cc=gregkh@suse.de \
--cc=linux-kernel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox