diff options
author | Alexander Beregalov <a.beregalov@gmail.com> | 2009-09-24 10:15:38 -0400 |
---|---|---|
committer | Jens Axboe <jens.axboe@oracle.com> | 2009-10-01 15:15:45 -0400 |
commit | 1e6f2dc11984b81c6438ff6cd45cdf15a02e3dfd (patch) | |
tree | 9b211749b8d09dd2fb7aa3874301c40002805932 /drivers | |
parent | 5dee2477df5368368b7dba810a17a3c411a1d0f0 (diff) |
cciss: fix build when !PROC_FS
Fix these build errors when CONFIG_PROC_FS is not set:
drivers/block/cciss.c: In function 'cciss_show_raid_level':
drivers/block/cciss.c:623: error: 'RAID_UNKNOWN' undeclared (first use in this function)
drivers/block/cciss.c:626: error: 'raid_label' undeclared (first use in this function)
drivers/block/cciss.c: In function 'cciss_geometry_inquiry':
drivers/block/cciss.c:2696: error: 'RAID_UNKNOWN' undeclared (first use in this function)
Signed-off-by: Alexander Beregalov <a.beregalov@gmail.com>
Signed-off-by: Jens Axboe <jens.axboe@oracle.com>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/block/cciss.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/drivers/block/cciss.c b/drivers/block/cciss.c index 4d879b792258..78852b103198 100644 --- a/drivers/block/cciss.c +++ b/drivers/block/cciss.c | |||
@@ -256,6 +256,11 @@ static inline void removeQ(CommandList_struct *c) | |||
256 | 256 | ||
257 | #include "cciss_scsi.c" /* For SCSI tape support */ | 257 | #include "cciss_scsi.c" /* For SCSI tape support */ |
258 | 258 | ||
259 | static const char *raid_label[] = { "0", "4", "1(1+0)", "5", "5+1", "ADG", | ||
260 | "UNKNOWN" | ||
261 | }; | ||
262 | #define RAID_UNKNOWN (sizeof(raid_label) / sizeof(raid_label[0])-1) | ||
263 | |||
259 | #ifdef CONFIG_PROC_FS | 264 | #ifdef CONFIG_PROC_FS |
260 | 265 | ||
261 | /* | 266 | /* |
@@ -264,10 +269,6 @@ static inline void removeQ(CommandList_struct *c) | |||
264 | #define ENG_GIG 1000000000 | 269 | #define ENG_GIG 1000000000 |
265 | #define ENG_GIG_FACTOR (ENG_GIG/512) | 270 | #define ENG_GIG_FACTOR (ENG_GIG/512) |
266 | #define ENGAGE_SCSI "engage scsi" | 271 | #define ENGAGE_SCSI "engage scsi" |
267 | static const char *raid_label[] = { "0", "4", "1(1+0)", "5", "5+1", "ADG", | ||
268 | "UNKNOWN" | ||
269 | }; | ||
270 | #define RAID_UNKNOWN (sizeof(raid_label) / sizeof(raid_label[0])-1) | ||
271 | 272 | ||
272 | static struct proc_dir_entry *proc_cciss; | 273 | static struct proc_dir_entry *proc_cciss; |
273 | 274 | ||