projects
/
openwrt
/
staging
/
blogic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
bcb4ddb
)
[PATCH] cciss: build with PROC_FS=n
author
Randy Dunlap
<
[email protected]
>
Sat, 30 Dec 2006 00:48:31 +0000
(16:48 -0800)
committer
Linus Torvalds
<
[email protected]
>
Sat, 30 Dec 2006 18:56:42 +0000
(10:56 -0800)
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 <
[email protected]
>
Cc: <
[email protected]
>
Cc: Jens Axboe <
[email protected]
>
Signed-off-by: Andrew Morton <
[email protected]
>
Signed-off-by: Linus Torvalds <
[email protected]
>
drivers/block/cciss.c
patch
|
blob
|
history
diff --git
a/drivers/block/cciss.c
b/drivers/block/cciss.c
index 9d2ddb209343ac7cd8d91ca5aaf2742df14df17c..05dfe357527c231037365be190baef05b39ef5f3 100644
(file)
--- 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"
};