diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2009-12-07 18:36:35 +0100 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2009-12-07 18:36:35 +0100 |
| commit | d014d043869cdc591f3a33243d3481fa4479c2d0 (patch) | |
| tree | 63626829498e647ba058a1ce06419fe7e4d5f97d /drivers/block | |
| parent | 6ec22f9b037fc0c2e00ddb7023fad279c365324d (diff) | |
| parent | 6070d81eb5f2d4943223c96e7609a53cdc984364 (diff) | |
| download | linux-d014d043869cdc591f3a33243d3481fa4479c2d0.tar.bz2 | |
Merge branch 'for-next' into for-linus
Conflicts:
kernel/irq/chip.c
Diffstat (limited to 'drivers/block')
| -rw-r--r-- | drivers/block/ataflop.c | 3 | ||||
| -rw-r--r-- | drivers/block/cciss_cmd.h | 2 |
2 files changed, 1 insertions, 4 deletions
diff --git a/drivers/block/ataflop.c b/drivers/block/ataflop.c index 847a9e57570a..a5af1d6dda8b 100644 --- a/drivers/block/ataflop.c +++ b/drivers/block/ataflop.c @@ -1478,10 +1478,7 @@ void do_fd_request(struct request_queue * q) stdma_lock(floppy_irq, NULL); atari_disable_irq( IRQ_MFP_FDC ); - local_save_flags(flags); /* The request function is called with ints - local_irq_disable(); * disabled... so must save the IPL for later */ redo_fd_request(); - local_irq_restore(flags); atari_enable_irq( IRQ_MFP_FDC ); } diff --git a/drivers/block/cciss_cmd.h b/drivers/block/cciss_cmd.h index dbaed1ea0da3..8098fccdbec4 100644 --- a/drivers/block/cciss_cmd.h +++ b/drivers/block/cciss_cmd.h @@ -5,7 +5,7 @@ //########################################################################### #define CISS_VERSION "1.00" -//general boundary defintions +//general boundary definitions #define SENSEINFOBYTES 32//note that this value may vary between host implementations #define MAXSGENTRIES 31 #define MAXREPLYQS 256 |