The patch titled
cciss: build with PROC_FS=n
has been added to the -mm tree. Its filename is
cciss-build-with-proc_fs=n.patch
See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find
out what to do about this
------------------------------------------------------
Subject: cciss: build with PROC_FS=n
From: Randy Dunlap <randy.dunlap@xxxxxxxxxx>
RAID_UNKNOWN is used even when PROC_FS=n, so move it outside of the
CONFIG_PROC_FS block.
drivers/block/cciss.c:1910: error: 'RAID_UNKNOWN' undeclared (first use in this function)
Signed-off-by: Randy Dunlap <randy.dunlap@xxxxxxxxxx>
Cc: <mike.miller@xxxxxx>
Cc: Jens Axboe <jens.axboe@xxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
drivers/block/cciss.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff -puN drivers/block/cciss.c~cciss-build-with-proc_fs=n drivers/block/cciss.c
--- a/drivers/block/cciss.c~cciss-build-with-proc_fs=n
+++ a/drivers/block/cciss.c
@@ -225,6 +225,8 @@ static inline CommandList_struct *remove
#include "cciss_scsi.c" /* For SCSI tape support */
+#define RAID_UNKNOWN 6
+
#ifdef CONFIG_PROC_FS
/*
@@ -232,7 +234,6 @@ static inline CommandList_struct *remove
*/
#define ENG_GIG 1000000000
#define ENG_GIG_FACTOR (ENG_GIG/512)
-#define RAID_UNKNOWN 6
static const char *raid_label[] = { "0", "4", "1(1+0)", "5", "5+1", "ADG",
"UNKNOWN"
};
_
Patches currently in -mm which might be from randy.dunlap@xxxxxxxxxx are
pci-probe-fix-macro-that-confuses-kernel-doc.patch
cciss-build-with-proc_fs=n.patch
git-alsa.patch
git-cpufreq.patch
git-gfs2-nmw.patch
git-mtd.patch
git-netdev-all.patch
parisc-fix-module_param-iommu-permission.patch
scsi-advansys-wrap-pci-table-inside-ifdef-config_pci.patch
reiser4-use-null-for-pointers.patch
extend-notifier_call_chain-to-count-nr_calls-made-fixes.patch
profile_likely-export-do_check_likely.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
