Re: [PATCH] Atari floppy: Rename disk_type to atari_disk_type

[Greg KH]

On Sun, Jan 27, 2008 at 02:28:35PM +0100, Geert Uytterhoeven wrote:
> 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@xxxxxxxxxxxxxx>
> Cc: Kay Sievers <kay.sievers@xxxxxxxx>
> Cc: Greg Kroah-Hartman <gregkh@xxxxxxx>

Acked-by: Greg Kroah-Hartman <gregkh@xxxxxxx>

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/