diff options
| author | Greg Kroah-Hartman | 2011-11-27 05:07:25 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman | 2011-11-27 05:07:25 +0100 |
| commit | dd7c7c3f69291baa488b8a50db683d5fbf44166a (patch) | |
| tree | 925bf294f30dffaa67a983c3859926ff53937e14 /include/linux/genhd.h | |
| parent | UART: add CSR SiRFprimaII SoC on-chip uart drivers (diff) | |
| parent | Linux 3.2-rc3 (diff) | |
| download | kernel-qcow2-linux-dd7c7c3f69291baa488b8a50db683d5fbf44166a.tar.gz kernel-qcow2-linux-dd7c7c3f69291baa488b8a50db683d5fbf44166a.tar.xz kernel-qcow2-linux-dd7c7c3f69291baa488b8a50db683d5fbf44166a.zip | |
Merge 3.2-rc3 into tty-next to handle merge conflict in tty_ldisc.c
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'include/linux/genhd.h')
| -rw-r--r-- | include/linux/genhd.h | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/include/linux/genhd.h b/include/linux/genhd.h index 9de31bc98c88..6d18f3531f18 100644 --- a/include/linux/genhd.h +++ b/include/linux/genhd.h @@ -21,8 +21,6 @@ #define dev_to_part(device) container_of((device), struct hd_struct, __dev) #define disk_to_dev(disk) (&(disk)->part0.__dev) #define part_to_dev(part) (&((part)->__dev)) -#define alias_name(disk) ((disk)->alias ? (disk)->alias : \ - (disk)->disk_name) extern struct device_type part_type; extern struct kobject *block_depr; @@ -60,7 +58,6 @@ enum { #define DISK_MAX_PARTS 256 #define DISK_NAME_LEN 32 -#define ALIAS_LEN 256 #include <linux/major.h> #include <linux/device.h> @@ -166,7 +163,6 @@ struct gendisk { * disks that can't be partitioned. */ char disk_name[DISK_NAME_LEN]; /* name of major driver */ - char *alias; /* alias name of disk */ char *(*devnode)(struct gendisk *gd, mode_t *mode); unsigned int events; /* supported events */ |