diff options
| author | Tejun Heo <tj@kernel.org> | 2009-07-03 18:13:18 -0400 |
|---|---|---|
| committer | Tejun Heo <tj@kernel.org> | 2009-07-03 18:13:18 -0400 |
| commit | c43768cbb7655ea5ff782ae250f6e2ef4297cf98 (patch) | |
| tree | 3982e41dde3eecaa3739a5d1a8ed18d04bd74f01 /drivers/scsi/sd.h | |
| parent | 1a8dd307cc0a2119be4e578c517795464e6dabba (diff) | |
| parent | 746a99a5af60ee676afa2ba469ccd1373493c7e7 (diff) | |
Merge branch 'master' into for-next
Pull linus#master to merge PER_CPU_DEF_ATTRIBUTES and alpha build fix
changes. As alpha in percpu tree uses 'weak' attribute instead of
inline assembly, there's no need for __used attribute.
Conflicts:
arch/alpha/include/asm/percpu.h
arch/mn10300/kernel/vmlinux.lds.S
include/linux/percpu-defs.h
Diffstat (limited to 'drivers/scsi/sd.h')
| -rw-r--r-- | drivers/scsi/sd.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/scsi/sd.h b/drivers/scsi/sd.h index 708778cf5f06..8474b5bad3fe 100644 --- a/drivers/scsi/sd.h +++ b/drivers/scsi/sd.h | |||
| @@ -45,6 +45,7 @@ struct scsi_disk { | |||
| 45 | unsigned int openers; /* protected by BKL for now, yuck */ | 45 | unsigned int openers; /* protected by BKL for now, yuck */ |
| 46 | sector_t capacity; /* size in 512-byte sectors */ | 46 | sector_t capacity; /* size in 512-byte sectors */ |
| 47 | u32 index; | 47 | u32 index; |
| 48 | unsigned short hw_sector_size; | ||
| 48 | u8 media_present; | 49 | u8 media_present; |
| 49 | u8 write_prot; | 50 | u8 write_prot; |
| 50 | u8 protection_type;/* Data Integrity Field */ | 51 | u8 protection_type;/* Data Integrity Field */ |