diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-08-01 23:48:42 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-08-01 23:48:42 -0400 |
| commit | 878701db07db3f0b59f14f0c525b681e4ca81551 (patch) | |
| tree | 132083fef920c0df6e41379909d3f071f2d68032 /drivers/ide/ide-tape.c | |
| parent | 04668873daa822aa6c806ba28d1143db8dcb26e8 (diff) | |
| parent | 3fcece66911c9d485c1e2050ba033fde607b5130 (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/bart/ide-2.6
* master.kernel.org:/pub/scm/linux/kernel/git/bart/ide-2.6:
scc_pata: PIO fixes
piix/slc90e66: fix PIO1 handling in ->speedproc method (take 2)
jmicron: PIO fixes
it8213: PIO fixes (take 2)
cs5535: PIO fixes
cs5520: fix PIO auto-tuning in ->ide_dma_check method
drivers/scsi/ide-scsi.c: kmalloc + memset conversion to kzalloc
drivers/ide/arm/icside.c: kmalloc + memset conversion to kzalloc
ide: eliminate warnings in ide-tape.c
ide: fix runtogether printk's in cmd64x IDE driver
sis5513: Add FSC Amilo A1630 PCI subvendor/dev to laptops
alim15x3: Correct HP detect
ide: Fix an overrun found in the CS5535 IDE driver
Diffstat (limited to 'drivers/ide/ide-tape.c')
| -rw-r--r-- | drivers/ide/ide-tape.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/ide/ide-tape.c b/drivers/ide/ide-tape.c index e82bfa5e0ab8..1fa57947bca0 100644 --- a/drivers/ide/ide-tape.c +++ b/drivers/ide/ide-tape.c | |||
| @@ -640,7 +640,7 @@ typedef enum { | |||
| 640 | } idetape_chrdev_direction_t; | 640 | } idetape_chrdev_direction_t; |
| 641 | 641 | ||
| 642 | struct idetape_bh { | 642 | struct idetape_bh { |
| 643 | unsigned short b_size; | 643 | u32 b_size; |
| 644 | atomic_t b_count; | 644 | atomic_t b_count; |
| 645 | struct idetape_bh *b_reqnext; | 645 | struct idetape_bh *b_reqnext; |
| 646 | char *b_data; | 646 | char *b_data; |