Commit:     d297a5d576d549d97dce456ba4bd01e5a47e899c
Parent:     bae19fe033b0c5ed99b1ed27a4cce84625a24606
Author:     Andrew Morton <[EMAIL PROTECTED]>
AuthorDate: Wed Nov 14 17:00:45 2007 -0800
Committer:  Linus Torvalds <[EMAIL PROTECTED]>
CommitDate: Wed Nov 14 18:45:44 2007 -0800

    aic94xx_sds: rename FLASH_SIZE
    drivers/scsi/aic94xx/aic94xx_sds.c:381:1: warning: "FLASH_SIZE" redefined
    In file included from include/asm/arch/irqs.h:22,
                     from include/asm/irq.h:4,
                     from include/asm/hardirq.h:6,
                     from include/linux/hardirq.h:7,
                     from include/asm-generic/local.h:5,
                     from include/asm/local.h:1,
                     from include/linux/module.h:19,
                     from include/linux/device.h:21,
                     from include/linux/pci.h:52,
                     from drivers/scsi/aic94xx/aic94xx_sds.c:28:
    include/asm/arch/platform.h:444:1: warning: this is the location of the 
previous definition
    Cc: Gilbert Wu <[EMAIL PROTECTED]>
    Cc: James Bottomley <[EMAIL PROTECTED]>
    Cc: Russell King <[EMAIL PROTECTED]>
    Signed-off-by: Andrew Morton <[EMAIL PROTECTED]>
    Signed-off-by: Linus Torvalds <[EMAIL PROTECTED]>
 drivers/scsi/aic94xx/aic94xx_sds.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/scsi/aic94xx/aic94xx_sds.c 
index 5b0932f..06509bf 100644
--- a/drivers/scsi/aic94xx/aic94xx_sds.c
+++ b/drivers/scsi/aic94xx/aic94xx_sds.c
@@ -377,7 +377,7 @@ out:
 #define FLASH_RESET                    0xF0
-#define FLASH_SIZE                      0x200000
+#define ASD_FLASH_SIZE                  0x200000
 #define FLASH_DIR_COOKIE                "*** ADAPTEC FLASH DIRECTORY *** "
 #define FLASH_NEXT_ENTRY_OFFS          0x2000
 #define FLASH_MAX_DIR_ENTRIES          32
@@ -609,7 +609,7 @@ static int asd_find_flash_dir(struct asd_ha_struct *asd_ha,
                              struct asd_flash_dir *flash_dir)
        u32 v;
-       for (v = 0; v < FLASH_SIZE; v += FLASH_NEXT_ENTRY_OFFS) {
+       for (v = 0; v < ASD_FLASH_SIZE; v += FLASH_NEXT_ENTRY_OFFS) {
                asd_read_flash_seg(asd_ha, flash_dir, v,
                if (memcmp(flash_dir->cookie, FLASH_DIR_COOKIE,
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at

Reply via email to