The patch titled aic94xx_sds: rename FLASH_SIZE has been added to the -mm tree. Its filename is aic94xx_sds-rename-flash_size.patch *** Remember to use Documentation/SubmitChecklist when testing your code *** See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find out what to do about this ------------------------------------------------------ Subject: aic94xx_sds: rename FLASH_SIZE From: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> arm: 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 Really it's arm which is being dumb here, but whatever. Cc: Gilbert Wu <gilbert_wu@xxxxxxxxxxx> Cc: James Bottomley <James.Bottomley@xxxxxxxxxxxxxxxxxxxxx> Cc: Russell King <rmk@xxxxxxxxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- drivers/scsi/aic94xx/aic94xx_sds.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff -puN drivers/scsi/aic94xx/aic94xx_sds.c~aic94xx_sds-rename-flash_size drivers/scsi/aic94xx/aic94xx_sds.c --- a/drivers/scsi/aic94xx/aic94xx_sds.c~aic94xx_sds-rename-flash_size +++ a/drivers/scsi/aic94xx/aic94xx_sds.c @@ -378,7 +378,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 @@ -610,7 +610,7 @@ static int asd_find_flash_dir(struct asd 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, sizeof(FLASH_DIR_COOKIE)-1); if (memcmp(flash_dir->cookie, FLASH_DIR_COOKIE, _ Patches currently in -mm which might be from akpm@xxxxxxxxxxxxxxxxxxxx are origin.patch uml-update-address-space-affected-by-pud_clear-checkpatch-fixes.patch improve-cgroup-printks-fix.patch proc-fix-proc_kill_inodes-to-kill-dentries-on-all-proc-superblocks-checkpatch-fixes.patch acpi-make-acpi_procfs-default-to-y.patch get_task_comm-return-the-result.patch clone-prepare-to-recycle-clone_detached-and-clone_stopped.patch hugetlb-split-alloc_huge_page-into-private-and-shared-components-checkpatch-fixes.patch revert-task-control-groups-example-cpu-accounting-subsystem.patch acpi-enable-c3-power-state-on-dell-inspiron-8200-fix.patch acpi-add-reboot-mechanism.patch small-acpica-extension-to-be-able-to-store-the-name-of.patch git-alsa.patch working-3d-dri-intel-agpko-resume-for-i815-chip.patch git-arm.patch agk-dm-dm-ioctl-move-compat-code-fix.patch unbork-gregkh-driver-kset-convert-sys-devices-to-use-kset_create-vioc.patch unbork-gregkh-driver-kset-convert-sys-devices-to-use-kset_create-vioc-fix.patch git-dvb.patch git-hwmon.patch ia64-slim-down-__clear_bit_unlock-checkpatch-fixes.patch elantech-touchpad-driver-fix.patch git-kvm.patch git-libata-all.patch drivers-ata-libata-ehc-fix-printk-warning.patch pata_hpt37x-fix-outstanding-bug-reports-on-the-hpt374-and-37x-cable-detect-checkpatch-fixes.patch ide-arm-hack.patch git-mmc.patch git-mtd.patch lmc_ioctl-dont-return-with-locks-held-fix.patch git-netdev-all.patch ucc_geth-fix-build-break-introduced-by-commit-09f75cd7bf13720738e6a196cc0107ce9a5bd5a0-checkpatch-fixes.patch update-smc91x-driver-with-arm-versatile-board-info.patch bluetooth-uninlining.patch nfs-stop-sillyname-renames-and-unmounts-from-racing-checkpatch-fixes.patch git-nfsd-fixup.patch quirk_vialatency-omit-reading-pci-revision-id-checkpatch-fixes.patch git-s390.patch fix-build-breakage-if-sysfs-fix.patch ips-trim-trailing-whitespace-checkpatch-fixes.patch scsi-gdth-kill-unneeded-irq-argument-checkpatch-fixes.patch scsi-fix-bugs-and-canonicalize-ncr5380_intr-drivers-checkpatch-fixes.patch bidi-support-scsi_data_buffer-broke-qla1280.patch bidi-support-scsi_data_buffer-broke-lots-of-stuff.patch git-unionfs.patch vfs-swap-do_ioctl-and-vfs_ioctl-names-fix.patch git-wireless.patch jiffies_round-jiffies_round_relative-conversion-rt2x00-checkpatch-fixes.patch git-ipwireless_cs.patch git-x86.patch git-x86-broke-lguest.patch git-x86-broke-xen-too.patch git-x86-inlining-borkage.patch oprofile-op_model_athalonc-support-for-amd-family10h-barcelona-performance-counters-checkpatch-fixes.patch i386-and-x86_64-randomize-brk-fix.patch x86-arch_register_cpu-section-fix.patch git-cryptodev-hifn_795x-fixes.patch mips-undo-locking-on-error-path-returns-checkpatch-fixes.patch pidns-place-under-config_experimental-checkpatch-fixes.patch fix-64kb-blocksize-in-ext3-directories-checkpatch-fixes.patch file-capabilities-allow-sigcont-within-session-v2-checkpatch-fixes.patch x86-disable-preemption-in-delay_tsc.patch tty-fix-network-driver-interactions-with-tcget-set-checkpatch-fixes.patch x86-early_quirks-cleanup.patch pagecache-zeroing-zero_user_segment-zero_user_segments-and-zero_user-fix.patch pagecache-zeroing-zero_user_segment-zero_user_segments-and-zero_user-fix-2.patch i386-resolve-dependency-of-asm-i386-pgtableh-on-highmemh-checkpatch-fixes.patch slub-fix-coding-style-violations-checkpatch-fixes.patch slub-provide-unique-end-marker-for-each-slab-fix.patch slub-do-our-own-locking-via-slab_lock-and-slab_unlock-checkpatch-fixes.patch bufferhead-revert-constructor-removal-checkpatch-fixes.patch maps4-make-page-monitoring-proc-file-optional-fix.patch vmscan-give-referenced-active-and-unmapped-pages-a-second-trip-around-the-lru.patch vm-dont-run-touch_buffer-during-buffercache-lookups.patch revert-capabilities-clean-up-file-capability-reading.patch revert-capabilities-clean-up-file-capability-reading-checkpatch-fixes.patch add-64-bit-capability-support-to-the-kernel-checkpatch-fixes.patch add-64-bit-capability-support-to-the-kernel-fix.patch alpha-atomic_add_return-should-return-int.patch pm-qos-infrastructure-and-interface.patch pm-qos-infrastructure-and-interface-static-initialization-with-blocking-notifiers.patch cris-build-fixes-atomich-needs-compilerh-fix.patch cris-build-fixes-update-eth_v10c-ethernet-driver-fix.patch cris-build-fixes-fixes-in-arch-cris-kernel-timec-checkpatch-fixes.patch cris-remove-mtd_amstd-and-mtd_obsolete_chips-take-two-checkpatch-fixes.patch uml-get-rid-of-asmlinkage-checkpatch-fixes.patch uml-improve-detection-of-host-cmov-checkpatch-fixes.patch uml-further-bugsc-tidying-checkpatch-fixes.patch deprecate-smbfs-in-favour-of-cifs.patch procfs-detect-duplicate-names.patch kernel-printkc-concerns-about-the-console-handover.patch fix-versus-precedence-in-various-places-checkpatch-fixes.patch pie-executable-randomization.patch pie-executable-randomization-uninlining.patch pie-executable-randomization-checkpatch-fixes.patch riscom8-fix-smp-brokenness-fix.patch use-macros-instead-of-task_-flags-checkpatch-fixes.patch sound-oss-pss-set_io_base-always-returns-success-mark-it-void-checkpatch-fixes.patch remove-warnings-for-longstanding-conditions-fix.patch parallel-port-convert-port_mutex-to-the-mutex-api-checkpatch-fixes.patch remove-support-for-un-needed-_extratext-section-checkpatch-fixes.patch allow-auto-destruction-of-loop-devices-checkpatch-fixes.patch remove-__attribute_used__-checkpatch-fixes.patch read_current_time-cleanups.patch read_current_time-cleanups-build-fix-fix.patch sync_sb_inodes-propagate-errors.patch mcp23s08-spi-gpio-expander-checkpatch-fixes.patch 64-bit-i_version-afs-fixes.patch ridiculous-ext3-costs-was-re-page-fault-costs.patch kill-filp_open-checkpatch-fixes.patch rename-open_namei-to-open_pathname-fix.patch r-o-bind-mounts-elevate-write-count-during-entire-ncp_ioctl-fix.patch r-o-bind-mounts-elevate-write-count-for-do_utimes.patch r-o-bind-mounts-elevate-write-count-for-some-ioctls-checkpatch-fixes.patch r-o-bind-mounts-elevate-write-count-for-some-ioctls-vs-forbid-user-to-change-file-flags-on-quota-files.patch r-o-bind-mounts-nfs-check-mnt-instead-of-superblock-directly-checkpatch-fixes.patch r-o-bind-mounts-track-number-of-mount-writer-fix-buggy-loop-checkpatch-fixes.patch slab-api-remove-useless-ctor-parameter-and-reorder-parameters-vs-revoke.patch revoke-wire-up-i386-system-calls.patch revoke-vs-git-block.patch cgroup-simplify-space-stripping-fix.patch memory-controller-memory-accounting-v7.patch memory-controller-add-per-container-lru-and-reclaim-v7.patch memory-controller-oom-handling-v7.patch memory-controller-add-switch-to-control-what-type-of-pages-to-limit-v7.patch memcontrol-move-oom-task-exclusion-to-tasklist.patch memory-cgroup-enhancements-add-status-accounting-function-for-memory-cgroup-checkpatch-fixes.patch memory-cgroup-enhancements-add-status-accounting-function-for-memory-cgroup-fix-1.patch memory-cgroup-enhancements-add-status-accounting-function-for-memory-cgroup-uninlining.patch memory-cgroup-enhancements-add-status-accounting-function-for-memory-cgroup-fix-2.patch memory-cgroup-enhancements-add-memorystat-file-checkpatch-fixes.patch memory-cgroup-enhancements-add-memorystat-file-printk-fix.patch drivers-edac-add-marvell-mv64x60-driver-fix.patch introduce-flags-for-reserve_bootmem-checkpatch-fixes.patch iget-stop-affs-from-using-iget-and-read_inode-try-checkpatch-fixes.patch iget-stop-efs-from-using-iget-and-read_inode-try-checkpatch-fixes.patch iget-stop-ext2-from-using-iget-and-read_inode-try-checkpatch-fixes.patch iget-stop-ext3-from-using-iget-and-read_inode-try-checkpatch-fixes.patch iget-stop-freevxfs-from-using-iget-and-read_inode-checkpatch-fixes.patch iget-stop-the-minix-filesystem-from-using-iget-and-checkpatch-fixes.patch iget-stop-procfs-from-using-iget-and-read_inode-checkpatch-fixes.patch iget-stop-qnx4-from-using-iget-and-read_inode-try-checkpatch-fixes.patch iget-stop-romfs-from-using-iget-and-read_inode-checkpatch-fixes.patch iget-stop-the-sysv-filesystem-from-using-iget-and-checkpatch-fixes.patch iget-stop-ufs-from-using-iget-and-read_inode-try-checkpatch-fixes.patch iget-stop-hostfs-from-using-iget-and-read_inode-checkpatch-fixes.patch embed-a-struct-path-into-struct-nameidata-instead-of-nd-dentrymnt-checkpatch-fixes.patch one-less-parameter-to-__d_path-checkpatch-fixes.patch d_path-use-struct-path-in-struct-avc_audit_data-checkpatch-fixes.patch d_path-make-get_dcookie-use-a-struct-path-argument-checkpatch-fixes.patch use-struct-path-in-struct-svc_export-checkpatch-fixes.patch suppress-aout-library-support-if-config_binfmt_aout-checkpatch-fixes.patch usb-net2280-cant-have-a-function-called-checkpatch-fixes.patch mn10300-add-the-mn10300-am33-architecture-to-the-kernel-fix.patch make-copy_from_user_inatomic-not-zero-the-tail-on-i386-vs-reiser4.patch reiser4.patch jens-broke-reiser4patch-added-to-mm-tree.patch page-owner-tracking-leak-detector.patch nr_blockdev_pages-in_interrupt-warning.patch slab-leaks3-default-y.patch profile-likely-unlikely-macros-fix.patch put_bh-debug.patch kmap_atomic-debugging.patch shrink_slab-handle-bad-shrinkers.patch getblk-handle-2tb-devices.patch getblk-handle-2tb-devices-fix.patch w1-build-fix.patch a.patch aic94xx_sds-rename-flash_size.patch - To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html