diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2009-06-15 15:04:58 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2009-06-15 15:04:58 +1000 |
| commit | 49542ae269ab7dd5bc78a1b8f070873037488f81 (patch) | |
| tree | 4f73162c837a42743f3158e6b8be0d02f0184097 /include/linux/genhd.h | |
| parent | 49f3a9396c4b2618798616ac3fa4731b51316718 (diff) | |
| parent | fe633466ce2cdbe2e6ff7c1ade4cf2639f2c0347 (diff) | |
Merge branch 'quilt/driver-core'
Conflicts:
arch/x86/kernel/microcode_core.c
drivers/base/firmware_class.c
drivers/scsi/ibmvscsi/ibmvscsi.c
init/main.c
Diffstat (limited to 'include/linux/genhd.h')
| -rw-r--r-- | include/linux/genhd.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/genhd.h b/include/linux/genhd.h index 7cbd38d363a2..45fc320a53c6 100644 --- a/include/linux/genhd.h +++ b/include/linux/genhd.h @@ -142,7 +142,7 @@ struct gendisk { * disks that can't be partitioned. */ char disk_name[DISK_NAME_LEN]; /* name of major driver */ - + char *(*nodename)(struct gendisk *gd); /* Array of pointers to partitions indexed by partno. * Protected with matching bdev lock but stat and other * non-critical accesses use RCU. Always access through |