Geert Uytterhoeven 5ceadd2a2a Atari floppy: Rename disk_type to atari_disk_type ... Commit edfaa7c365 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>		2008-02-06 10:41:10 -08:00
..
aoe	…
paride	…
DAC960.c	…
DAC960.h	…
Kconfig	…
Makefile	…
amiflop.c	…
ataflop.c	Atari floppy: Rename disk_type to atari_disk_type	2008-02-06 10:41:10 -08:00
cciss.c	cciss: use upper_32_bits() macro to eliminate warnings	2008-02-06 10:41:03 -08:00
cciss.h	…
cciss_cmd.h	…
cciss_scsi.c	…
cciss_scsi.h	…
cpqarray.c	…
cpqarray.h	…
cryptoloop.c	…
floppy.c	…
ida_cmd.h	…
ida_ioctl.h	…
loop.c	…
nbd.c	…
pktcdvd.c	…
ps2esdi.c	…
ps3disk.c	…
rd.c	rd: use is_power_of_2() in drivers/block/rd.c.	2008-02-06 10:41:03 -08:00
smart1,2.h	…
sunvdc.c	…
swim3.c	…
sx8.c	…
ub.c	…
umem.c	…
umem.h	…
viodasd.c	…
virtio_blk.c	…
xd.c	…
xd.h	…
xen-blkfront.c	…
xsysace.c	…
z2ram.c	…