diff options
| author | Geert Uytterhoeven <geert@linux-m68k.org> | 2008-02-06 10:38:09 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-02-06 19:41:10 +0100 |
| commit | 5ceadd2a2a9cf2768a9baf808abf1ffeedcc4cc4 (patch) | |
| tree | f4cccb9f3a99b3ebdbeb92a63f343835e86f685c /drivers/parisc/gsc.h | |
| parent | W1: w1_therm.c standardize units to millidegrees C (diff) | |
| download | linux-5ceadd2a2a9cf2768a9baf808abf1ffeedcc4cc4.tar.xz linux-5ceadd2a2a9cf2768a9baf808abf1ffeedcc4cc4.zip | |
Atari floppy: Rename disk_type to atari_disk_type
Commit edfaa7c36574f1bf09c65ad602412db9da5f96bf
Driver core: convert block from raw kobjects to core devices
This moves the block devices to /sys/class/block. It will create a
flat list of all block devices, with the disks and partitions in one
directory. For compatibility /sys/block is created and contains symlinks
to the disks.
introduced a global disk_type variable in <linux/genhd.h>, causing the
following compile error on Atari:
drivers/block/ataflop.c:93: error: conflicting types for 'disk_type'
include/linux/genhd.h:21: error: previous declaration of 'disk_type' was here
Rename the local disk_type variable in drivers/block/ataflop.c to
atari_disk_type, to avoid the conflict.
Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
Cc: Kay Sievers <kay.sievers@vrfy.org>
Acked-by: Greg Kroah-Hartman <gregkh@suse.de>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers/parisc/gsc.h')
0 files changed, 0 insertions, 0 deletions