diff options
author | Randy Dunlap <randy.dunlap@oracle.com> | 2006-12-29 19:48:31 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.osdl.org> | 2006-12-30 13:56:42 -0500 |
commit | 0f5486ecf7d510595c2af630aae31ed5846bdbeb (patch) | |
tree | 6e0cf477eefc301993a300c446fb16194a3c3af5 | |
parent | bcb4ddb46a4c66d64d091e7ffa951b2aa1ba537f (diff) |
[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>
-rw-r--r-- | drivers/block/cciss.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/block/cciss.c b/drivers/block/cciss.c index 9d2ddb209343..05dfe357527c 100644 --- a/drivers/block/cciss.c +++ b/drivers/block/cciss.c | |||
@@ -225,6 +225,8 @@ static inline CommandList_struct *removeQ(CommandList_struct **Qptr, | |||
225 | 225 | ||
226 | #include "cciss_scsi.c" /* For SCSI tape support */ | 226 | #include "cciss_scsi.c" /* For SCSI tape support */ |
227 | 227 | ||
228 | #define RAID_UNKNOWN 6 | ||
229 | |||
228 | #ifdef CONFIG_PROC_FS | 230 | #ifdef CONFIG_PROC_FS |
229 | 231 | ||
230 | /* | 232 | /* |
@@ -232,7 +234,6 @@ static inline CommandList_struct *removeQ(CommandList_struct **Qptr, | |||
232 | */ | 234 | */ |
233 | #define ENG_GIG 1000000000 | 235 | #define ENG_GIG 1000000000 |
234 | #define ENG_GIG_FACTOR (ENG_GIG/512) | 236 | #define ENG_GIG_FACTOR (ENG_GIG/512) |
235 | #define RAID_UNKNOWN 6 | ||
236 | static const char *raid_label[] = { "0", "4", "1(1+0)", "5", "5+1", "ADG", | 237 | static const char *raid_label[] = { "0", "4", "1(1+0)", "5", "5+1", "ADG", |
237 | "UNKNOWN" | 238 | "UNKNOWN" |
238 | }; | 239 | }; |