summaryrefslogtreecommitdiffstats
path: root/drivers/block
diff options
context:
space:
mode:
authorRandy Dunlap <randy.dunlap@oracle.com>2006-12-29 16:48:31 -0800
committerLinus Torvalds <torvalds@woody.osdl.org>2006-12-30 10:56:42 -0800
commit0f5486ecf7d510595c2af630aae31ed5846bdbeb (patch)
tree6e0cf477eefc301993a300c446fb16194a3c3af5 /drivers/block
parentbcb4ddb46a4c66d64d091e7ffa951b2aa1ba537f (diff)
downloadop-kernel-dev-0f5486ecf7d510595c2af630aae31ed5846bdbeb.zip
op-kernel-dev-0f5486ecf7d510595c2af630aae31ed5846bdbeb.tar.gz
[PATCH] cciss: build with PROC_FS=n
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@oracle.com> Cc: <mike.miller@hp.com> Cc: Jens Axboe <jens.axboe@oracle.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'drivers/block')
-rw-r--r--drivers/block/cciss.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/block/cciss.c b/drivers/block/cciss.c
index 9d2ddb2..05dfe35 100644
--- a/drivers/block/cciss.c
+++ b/drivers/block/cciss.c
@@ -225,6 +225,8 @@ static inline CommandList_struct *removeQ(CommandList_struct **Qptr,
#include "cciss_scsi.c" /* For SCSI tape support */
+#define RAID_UNKNOWN 6
+
#ifdef CONFIG_PROC_FS
/*
@@ -232,7 +234,6 @@ static inline CommandList_struct *removeQ(CommandList_struct **Qptr,
*/
#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"
};
OpenPOWER on IntegriCloud