diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-11-27 07:17:50 +0900 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-11-27 07:17:50 +0900 |
| commit | 78daa87b1d332e4ac963c793a4157533d57501c7 (patch) | |
| tree | c133840b219a446c11fa2391bb0d887e71f5809f /drivers/block/cciss.c | |
| parent | d4d2ad948e9a9c316e72fdc09d7490dfda4773da (diff) | |
| parent | bbe425cd9ae83eacd0c9f09df2bf56dc911a54cd (diff) | |
| download | kernel_samsung_smdk4412-78daa87b1d332e4ac963c793a4157533d57501c7.zip kernel_samsung_smdk4412-78daa87b1d332e4ac963c793a4157533d57501c7.tar.gz kernel_samsung_smdk4412-78daa87b1d332e4ac963c793a4157533d57501c7.tar.bz2 | |
Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-block
* 'for-linus' of git://git.kernel.dk/linux-2.6-block:
cciss: fix build for PROC_FS disabled
block: fix amiga and atari floppy driver compile warning
blk-throttle: Fix calculation of max number of WRITES to be dispatched
ioprio: grab rcu_read_lock in sys_ioprio_{set,get}()
xen/blkfront: cope with backend that fail empty BLKIF_OP_WRITE_BARRIER requests
xen/blkfront: Implement FUA with BLKIF_OP_WRITE_BARRIER
xen/blkfront: change blk_shadow.request to proper pointer
xen/blkfront: map REQ_FLUSH into a full barrier
Diffstat (limited to 'drivers/block/cciss.c')
| -rw-r--r-- | drivers/block/cciss.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/block/cciss.c b/drivers/block/cciss.c index a67d0a6..f291587 100644 --- a/drivers/block/cciss.c +++ b/drivers/block/cciss.c @@ -66,6 +66,7 @@ MODULE_VERSION("3.6.26"); MODULE_LICENSE("GPL"); static DEFINE_MUTEX(cciss_mutex); +static struct proc_dir_entry *proc_cciss; #include "cciss_cmd.h" #include "cciss.h" @@ -363,8 +364,6 @@ static const char *raid_label[] = { "0", "4", "1(1+0)", "5", "5+1", "ADG", #define ENG_GIG_FACTOR (ENG_GIG/512) #define ENGAGE_SCSI "engage scsi" -static struct proc_dir_entry *proc_cciss; - static void cciss_seq_show_header(struct seq_file *seq) { ctlr_info_t *h = seq->private; |